Permalink
Browse files

Revert "Add AIO"

This reverts commit 1817542.
  • Loading branch information...
1 parent 1817542 commit d097ec498e46e3fc110146c676d1cbf9c801042e @renaudallard committed Nov 26, 2011
Showing with 22 additions and 3 deletions.
  1. +1 −1 .version
  2. +21 −2 arch/arm/configs/aries_ra_defconfig
View
2 .version
@@ -1 +1 @@
-1986
+1975
View
23 arch/arm/configs/aries_ra_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.8 Kernel Configuration
+# Linux/arm 3.0.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -116,7 +116,7 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_ASHMEM=y
-CONFIG_AIO=y
+# CONFIG_AIO is not set
CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
@@ -1732,6 +1732,15 @@ CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_ANDROID=y
+# CONFIG_USB_ANDROID_ACM is not set
+CONFIG_USB_ANDROID_ADB=y
+CONFIG_USB_ANDROID_MASS_STORAGE=y
+# CONFIG_USB_ANDROID_MTP is not set
+CONFIG_USB_ANDROID_RNDIS=y
+CONFIG_USB_ANDROID_RNDIS_WCEIS=y
+CONFIG_USB_ANDROID_RNDIS_DWORD_ALIGNED=y
+CONFIG_USB_ANDROID_ACCESSORY=y
# CONFIG_USB_CDC_COMPOSITE is not set
# CONFIG_USB_G_NOKIA is not set
# CONFIG_USB_G_MULTI is not set
@@ -2308,5 +2317,15 @@ CONFIG_NLATTR=y
CONFIG_CORDIC=y
+
+
+
+
+
+
+
+
+
+
CONFIG_FB_VOODOO=y
# CONFIG_FB_VOODOO_DEBUG_LOG is not set

0 comments on commit d097ec4

Please sign in to comment.