diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-07-21 10:19:26 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2011-07-21 10:21:27 -0700 |
commit | 09d5fe5e75d3903368cb13b2f07fe80a8264872d (patch) | |
tree | ef483c134a77787f2fb50d12ded069ca89ac1669 | |
parent | 9a4c218ceeeaa7b31caae0b66794da45f9f12374 (diff) | |
download | omap-android-omap-2.6.39.tar.gz |
ARM: omap4: panda: clean up defconfigandroid-omap-2.6.39
This brings it closer to the output of make savedefconfig,
by eliminating cosmetic differences.
Signed-off-by: Jean-Baptiste Queru <jbq@google.com>
-rw-r--r-- | arch/arm/configs/panda_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index bc8b9671633f..1afdefad4e5d 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -9,10 +9,10 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y CONFIG_KALLSYMS_ALL=y CONFIG_ASHMEM=y # CONFIG_AIO is not set +CONFIG_EMBEDDED=y # CONFIG_SLUB_DEBUG is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y @@ -163,6 +163,8 @@ CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y CONFIG_NETDEVICES=y CONFIG_IFB=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_SMSC95XX=y CONFIG_PPP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_BSDCOMP=y @@ -219,8 +221,6 @@ CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 CONFIG_USB_ANDROID=y CONFIG_USB_ANDROID_ADB=y -CONFIG_USB_USBNET=y -CONFIG_USB_NET_SMSC95XX=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y |