diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-08 21:56:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-08 21:56:44 +0100 |
commit | 72860ea3a6be3cfb16353922ec27eef5e34fdb0c (patch) | |
tree | 044e0d8d50d77b9b1844e6bff4be2c0b7a45d6a8 /linaro | |
parent | e1073074665cb187f092a80215fbdd1a49179c14 (diff) | |
parent | dfeccc862baebe24c3cc0fcfa4afcac57757dde4 (diff) |
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
Diffstat (limited to 'linaro')
-rw-r--r-- | linaro/configs/arndale.conf | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf index 90ce9b71ed3..109052f2f6e 100644 --- a/linaro/configs/arndale.conf +++ b/linaro/configs/arndale.conf @@ -26,9 +26,6 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_EXYNOS=y CONFIG_AX88796=y CONFIG_AX88796_93CX6=y -CONFIG_USB_USBNET=y -CONFIG_USB_NET_DM9601=y -CONFIG_USB_NET_MCS7830=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_TOUCHSCREEN=y @@ -52,22 +49,6 @@ CONFIG_DRM_EXYNOS_DMABUF=y CONFIG_DRM_EXYNOS_HDMI=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_DWC3=y -CONFIG_USB_PHY=y -CONFIG_SAMSUNG_USB2PHY=y -CONFIG_SAMSUNG_USB3PHY=y -CONFIG_USB_ARCH_HAS_XHCI=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_S5P=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_EXYNOS=y -CONFIG_USB_STORAGE=y -CONFIG_SAMSUNG_USBPHY=y -CONFIG_USB_GADGET=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_DW=y |