build without grsec and old module-init-tools

[packages/kernel.git] / kernel-multiarch.config

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 5c21816a5aa23b64270bd67d0ea222a6a63bc53a..2cc4c1528d076b56b9be343a32f4b789b8e6bf86 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -3,8 +3,7 @@
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
-LBD all=y
-BLK_DEV_IO_TRACE all=n
+LBDAF i386=y ppc=y sparc=y sparc64=
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
 #- file block/Kconfig.iosched goes here
@@ -54,9 +53,11 @@ CRYPTO_XTS all=m
 #- Hash modes
 CRYPTO_HMAC all=y
 CRYPTO_XCBC all=m
+CRYPTO_VMAC all=m
 #- Digest
 CRYPTO_CRC32C all=m
 CRYPTO_CRC32C_INTEL all=m
+CRYPTO_GHASH all=m
 CRYPTO_MD4 all=m
 CRYPTO_MD5 all=y
 CRYPTO_MICHAEL_MIC all=m
@@ -64,7 +65,7 @@ CRYPTO_RMD128 all=m
 CRYPTO_RMD160 all=m
 CRYPTO_RMD256 all=m
 CRYPTO_RMD320 all=m
-CRYPTO_SHA1 all=m
+CRYPTO_SHA1 all=y
 CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
 CRYPTO_TGR192 all=m
@@ -73,6 +74,7 @@ CRYPTO_WP512 all=m
 CRYPTO_AES all=m
 CRYPTO_AES_586 i386=m
 CRYPTO_AES_X86_64 x86_64=m
+CRYPTO_AES_NI_INTEL all=m
 CRYPTO_ANUBIS all=m
 CRYPTO_ARC4 all=m
 CRYPTO_BLOWFISH all=m
@@ -94,6 +96,7 @@ CRYPTO_TWOFISH_586 i386=m
 CRYPTO_TWOFISH_X86_64 x86_64=m
 #- Compression
 CRYPTO_DEFLATE all=m
+CRYPTO_ZLIB all=m
 CRYPTO_LZO all=m
 #- Random Number Generation
 CRYPTO_ANSI_CPRNG all=m
@@ -108,20 +111,22 @@ A11Y_BRAILLE_CONSOLE=y
 #-
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
-ACPI all=y
-ACPI_SLEEP i386=y x86_64=y
+ACPI ia64=y x86=y
+ACPI_SLEEP x86=y
 ACPI_PROCFS all=y
-ACPI_PROCFS_POWER i386=y ia64=y x86_64=y
-ACPI_SYSFS_POWER i386=y ia64=y x86_64=y
+ACPI_PROCFS_POWER ia64=y x86=y
+ACPI_POWER_METER all=m
+ACPI_SYSFS_POWER ia64=y x86=y
 ACPI_PROC_EVENT all=y
-ACPI_AC i386=m x86_64=m
-ACPI_BATTERY i386=m x86_64=m
+ACPI_AC x86=m
+ACPI_BATTERY x86=m
 ACPI_BUTTON all=m
-ACPI_VIDEO i386=m x86_64=m
+ACPI_VIDEO x86=m
 ACPI_FAN all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=m
 ACPI_HOTPLUG_CPU all=y
+ACPI_PROCESSOR_AGGREGATOR all=m
 ACPI_THERMAL all=m
 ACPI_NUMA ia64=y x86_64=y
 ACPI_CUSTOM_DSDT_FILE all=""
@@ -129,16 +134,17 @@ ACPI_CUSTOM_DSDT all=n
 ACPI_BLACKLIST_YEAR all=0
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=m
-X86_PM_TIMER i386=y x86_64=y
+X86_PM_TIMER x86=y
 ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=m
-ACPI_SBS i386=m x86_64=m
+ACPI_SBS x86=m
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
 #-
 ATA all=m
 ATA_NONSTANDARD all=n ia64=y ppc64=y
+ATA_VERBOSE_ERROR all=y
 ATA_ACPI all=y
 SATA_PMP all=y sparc=n
 SATA_AHCI all=m sparc=n
@@ -163,6 +169,7 @@ PATA_ACPI i386=m ia64=m x86_64=m
 PATA_ALI all=m sparc=n
 PATA_AMD all=m sparc=n
 PATA_ARTOP all=m sparc=n
+PATA_ATP867X all=m
 PATA_ATIIXP all=m sparc=n
 PATA_CMD640_PCI all=m sparc=n
 PATA_CMD64X all=m sparc=n
@@ -198,6 +205,7 @@ PATA_PCMCIA all=m
 PATA_PDC_OLD all=m sparc=n
 PATA_QDI alpha=m i386=m
 PATA_RADISYS all=m sparc=n
+PATA_RDC all=m
 PATA_RZ1000 all=m sparc=n
 PATA_SC1200 all=m sparc=n
 PATA_SERVERWORKS all=m sparc=n
@@ -260,6 +268,8 @@ CFAG12864B_RATE i386=20 x86_64=20
 #- *** FILE: drivers/base/Kconfig ***
 #-
 UEVENT_HELPER_PATH all="/sbin/hotplug"
+DEVTMPFS all=y
+DEVTMPFS_MOUNT all=n
 STANDALONE all=n
 PREVENT_FIRMWARE_BUILD all=y
 FIRMWARE_IN_KERNEL all=n
@@ -286,6 +296,7 @@ BLK_DEV_COW_COMMON all=n
 BLK_DEV_LOOP all=m
 BLK_DEV_CRYPTOLOOP all=n
 BLK_DEV_NBD all=m
+BLK_DEV_OSD all=m
 BLK_DEV_SX8 all=m
 BLK_DEV_UB all=n
 BLK_DEV_RAM all=y
@@ -345,6 +356,8 @@ BT_HCIBT3C all=m
 BT_HCIBLUECARD all=m
 BT_HCIBTUART all=m
 BT_HCIVHCI all=m
+BT_MRVL all=m
+BT_MRVL_SDIO all=m
 
 #-
 #- *** FILE: drivers/char/Kconfig ***
@@ -451,11 +464,12 @@ AGP_SGI_TIOCA ia64=m
 #- *** FILE: drivers/char/hw_random/Kconfig ***
 #-
 HW_RANDOM all=m alpha=y i386=y sparc64=y
+HW_RANDOM_TIMERIOMEM all=m
 HW_RANDOM_INTEL all=m
 HW_RANDOM_AMD i386=m x86_64=m
 HW_RANDOM_GEODE i386=m x86_64=m
 HW_RANDOM_N2RNG sparc64=m
-HW_RANDOM_VIA i386=m
+HW_RANDOM_VIA all=m
 HW_RANDOM_PASEMI ppc64=m
 HW_RANDOM_VIRTIO=m
 
@@ -480,8 +494,10 @@ IPWIRELESS all=m
 #-
 #- *** FILE: drivers/char/tpm/Kconfig ***
 #-
-TCG_TPM all=m
-TCG_TIS all=m
+#* TCG_TPM forced to 'y' by IMA
+TCG_TPM all=m x86=y ia64=y
+#* TCG_TIS forced to 'y' by IMA
+TCG_TIS all=m x86=y ia64=y
 TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
@@ -519,9 +535,9 @@ CPU_IDLE i386=y sparc64=n x86_64=y
 #- *** FILE: drivers/crypto/Kconfig ***
 #-
 CRYPTO_HW all=y
-CRYPTO_DEV_PADLOCK i386=m
-CRYPTO_DEV_PADLOCK_AES i386=m
-CRYPTO_DEV_PADLOCK_SHA i386=m
+CRYPTO_DEV_PADLOCK all=m
+CRYPTO_DEV_PADLOCK_AES all=m
+CRYPTO_DEV_PADLOCK_SHA all=m
 CRYPTO_DEV_GEODE i386=m
 CRYPTO_DEV_HIFN_795X all=m
 CRYPTO_DEV_HIFN_795X_RNG all=y
@@ -537,6 +553,7 @@ FSL_DMA ppc=y ppc64=y
 DMA_ENGINE all=y
 #- DMA Clients
 NET_DMA all=y
+ASYNC_TX_DMA all=y
 DMATEST all=n
 
 #-
@@ -545,13 +562,17 @@ DMATEST all=n
 EDAC all=y
 #- Reporting subsystems
 EDAC_DEBUG all=n
+EDAC_DECODE_MCE all=m
 EDAC_MM_EDAC all=m
+EDAC_AMD64 x86_64=m
+EDAC_AMD64_ERROR_INJECTION x86_64=y
 EDAC_AMD76X i386=m
 EDAC_E7XXX i386=m
 EDAC_E752X i386=m x86_64=m
 EDAC_I82875P i386=m
 EDAC_I82975X i386=m x86_64=m
 EDAC_I3000 i386=m x86_64=m
+EDAC_I3200 all=m
 EDAC_X38 i386=m x86_64=m
 EDAC_I5400 all=m
 EDAC_I82860 i386=m
@@ -560,6 +581,8 @@ EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
+EDAC_AMD8131 powerpc=m
+EDAC_AMD8111 powerpc=m
 
 #-
 #- *** FILE: drivers/eisa/Kconfig ***
@@ -572,11 +595,12 @@ EISA_NAMES alpha=y i386=y
 #-
 #- *** FILE: drivers/firewire/Kconfig ***
 #-
-#- A new alternative FireWire stack is available with EXPERIMENTAL=y
-#- Enable only one of the two stacks, unless you know what you are doing
+#- You can enable one or both FireWire driver stacks.
+#- See the help texts for more information.
 FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
 FIREWIRE_OHCI all=m
 FIREWIRE_SBP2 all=m
+FIREWIRE_NET all=m
 
 #-
 #- *** FILE: drivers/firmware/Kconfig ***
@@ -598,17 +622,22 @@ GPIOLIB all=y
 DEBUG_GPIO all=n
 GPIO_SYSFS all=y
 #- Memory mapped GPIO expanders:
-GPIO_XILINX ppc=y
+GPIO_XILINX powerpc=y
 #- I2C GPIO expanders:
 GPIO_MAX732X all=m
 GPIO_PCA953X all=m
 GPIO_PCF857X all=m
 GPIO_TWL4030 powerpc=m
+GPIO_WM831X all=m
 #- PCI GPIO expanders:
 GPIO_BT8XX all=m
+GPIO_LANGWELL all=n
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
+GPIO_MC33880 all=m
+#- AC97 GPIO expanders:
+GPIO_UCB1400 all=y
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -620,27 +649,32 @@ DRM_RADEON all=m
 DRM_I810 i386=m x86_64=m
 DRM_I830 i386=m x86_64=m
 DRM_I915 i386=m x86_64=m
-DRM_I915_KMS all=n
+DRM_I915_KMS all=y
 DRM_MGA all=m
 DRM_SIS all=m
 DRM_VIA all=m
 DRM_SAVAGE all=m
 
+#-
+#- *** FILE: drivers/gpu/drm/radeon/Kconfig ***
+#-
+DRM_RADEON_KMS all=y
+
 #-
 #- *** FILE: drivers/hid/Kconfig ***
 #-
 HID_SUPPORT all=y
 HID all=m
-HID_DEBUG all=n
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
-HID_COMPAT all=n
+DRAGONRISE_FF all=y
 LOGITECH_FF all=y
 LOGIRUMBLEPAD2_FF all=y
 PANTHERLORD_FF all=y
-GREENASIA_FF all=m
-THRUSTMASTER_FF all=m
-ZEROPLUS_FF all=m
+GREENASIA_FF all=y
+SMARTJOYPLUS_FF all=y
+THRUSTMASTER_FF all=y
+ZEROPLUS_FF all=y
 
 #-
 #- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -658,6 +692,8 @@ USB_MOUSE all=n
 #-
 HWMON all=m
 HWMON_VID all=m
+HWMON_DEBUG_CHIP all=n
+#- Native drivers
 SENSORS_ABITUGURU all=m
 SENSORS_ABITUGURU3 all=m
 SENSORS_AD7414 all=m
@@ -684,9 +720,8 @@ SENSORS_I5K_AMB all=m
 SENSORS_F71805F all=m
 SENSORS_F71882FG all=m
 SENSORS_F75375S all=m
-SENSORS_FSCHER all=m
-SENSORS_FSCPOS all=m
 SENSORS_FSCHMD all=m
+SENSORS_G760A all=m
 SENSORS_GL518SM all=m
 SENSORS_GL520SM all=m
 SENSORS_CORETEMP all=m
@@ -705,12 +740,16 @@ SENSORS_LM87 all=m
 SENSORS_LM90 all=m
 SENSORS_LM92 all=m
 SENSORS_LM93 all=m
+SENSORS_LTC4215 all=m
 SENSORS_LTC4245 all=m
+SENSORS_LM95241 all=m
 SENSORS_MAX1111 all=m
 SENSORS_MAX1619 all=m
 SENSORS_MAX6650 all=m
 SENSORS_PC87360 all=m
 SENSORS_PC87427 all=m
+SENSORS_PCF8591 all=m
+SENSORS_SHT15 all=m
 SENSORS_SIS5595 all=m
 SENSORS_DME1737 all=m
 SENSORS_SMSC47M1 all=m
@@ -718,6 +757,8 @@ SENSORS_SMSC47M192 all=m
 SENSORS_SMSC47B397 all=m
 SENSORS_ADS7828 all=m
 SENSORS_THMC50 all=m
+SENSORS_TMP401 all=m
+SENSORS_TMP421 all=m
 SENSORS_VIA686A all=m
 SENSORS_VT1211 all=m
 SENSORS_VT8231 all=m
@@ -729,16 +770,22 @@ SENSORS_W83L785TS all=m
 SENSORS_W83L786NG all=m
 SENSORS_W83627HF all=m
 SENSORS_W83627EHF all=m
+SENSORS_WM831X all=m
+SENSORS_WM8350 all=m
+SENSORS_ULTRA45 sparc64=m
 SENSORS_HDAPS all=m
-SENSORS_LIS3LV02D all=m
+SENSORS_LIS3_SPI all=m
 SENSORS_APPLESMC all=m
-HWMON_DEBUG_CHIP all=n
+#- ACPI drivers
+SENSORS_ATK0110 all=m
+SENSORS_LIS3LV02D all=m
 
 #-
 #- *** FILE: drivers/i2c/Kconfig ***
 #-
 I2C all=m ppc=y ppc64=y
 I2C_BOARDINFO all=y
+I2C_COMPAT all=y
 I2C_CHARDEV all=m
 I2C_HELPER_AUTO all=y
 #- file drivers/i2c/algos/Kconfig goes here
@@ -777,10 +824,13 @@ I2C_SIS630 all=m
 I2C_SIS96X all=m
 I2C_VIA all=m sparc=n
 I2C_VIAPRO all=m
+#- ACPI drivers
+I2C_SCMI all=m
 #- Mac SMBus host controller drivers
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
 #- I2C system bus drivers (mostly embedded / system-on-chip)
+I2C_DESIGNWARE powerpc=m
 I2C_GPIO all=m
 I2C_MPC ppc=n
 I2C_OCORES all=m
@@ -807,11 +857,6 @@ SCx200_ACB i386=m
 #- *** FILE: drivers/i2c/chips/Kconfig ***
 #-
 DS1682 all=m
-SENSORS_PCF8574 all=m
-PCF8575 all=m
-SENSORS_PCA9539 all=m
-SENSORS_PCF8591 all=m
-SENSORS_MAX6875 all=m
 SENSORS_TSL2550 all=m
 
 #-
@@ -879,7 +924,6 @@ BLK_DEV_CELLEB ppc64=m
 #* BLK_DEV_IDE_PMAC could be 'm' but it fails to build with PMAC_MEDIABAY=y
 BLK_DEV_IDE_PMAC ppc=y ppc64=y
 BLK_DEV_IDE_PMAC_ATA100FIRST ppc=y ppc64=y
-IDE_ARM all=n
 #- Other IDE chipsets support
 #- Note: most of these also require special kernel boot parameters
 BLK_DEV_4DRIVES alpha=m i386=m
@@ -912,6 +956,12 @@ IEEE1394_VIDEO1394 all=m sparc=
 IEEE1394_DV1394 all=m sparc=
 IEEE1394_VERBOSEDEBUG all=n sparc=
 
+#-
+#- *** FILE: drivers/ieee802154/Kconfig ***
+#-
+IEEE802154_DRIVERS all=m
+IEEE802154_FAKEHARD all=m
+
 #-
 #- *** FILE: drivers/infiniband/Kconfig ***
 #-
@@ -987,7 +1037,7 @@ INFINIBAND_SRP all=m sparc=
 #-
 INPUT all=y
 INPUT_FF_MEMLESS all=m
-INPUT_POLLDEV all=m sparc=n
+INPUT_POLLDEV all=m
 #- Userland interfaces
 INPUT_MOUSEDEV all=y
 INPUT_MOUSEDEV_PSAUX all=y
@@ -1058,13 +1108,20 @@ JOYSTICK_IFORCE_232 all=y
 #- *** FILE: drivers/input/keyboard/Kconfig ***
 #-
 INPUT_KEYBOARD all=y
+KEYBOARD_ADP5588 all=m 
 KEYBOARD_ATKBD all=y sparc=m sparc64=m
-KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+QT2160 all=m
 KEYBOARD_LKKBD all=m
-KEYBOARD_XTKBD all=m
+KEYBOARD_GPIO all=m
+KEYBOARD_MATRIX all=m
+KEYBOARD_LM8323 all=m
+KEYBOARD_MAX7359 all=m
 KEYBOARD_NEWTON all=m
+KEYBOARD_OPENCORES all=m
 KEYBOARD_STOWAWAY all=m
-KEYBOARD_GPIO all=m
+KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+KEYBOARD_TWL4030 powerpc=m
+KEYBOARD_XTKBD all=m
 
 #-
 #- *** FILE: drivers/input/misc/Kconfig ***
@@ -1081,8 +1138,13 @@ INPUT_KEYSPAN_REMOTE all=m sparc=n
 INPUT_POWERMATE all=m sparc=n
 INPUT_YEALINK all=m sparc=n
 INPUT_CM109 all=m
+INPUT_TWL4030_PWRBUTTON powerpc=m
 INPUT_UINPUT all=m sparc=n
+INPUT_WINBOND_CIR all=m
 INPUT_PCF50633_PMU all=m
+INPUT_GPIO_ROTARY_ENCODER all=m
+INPUT_WM831X_ON all=m
+INPUT_PCAP all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -1095,6 +1157,7 @@ MOUSE_PS2_SYNAPTICS all=y
 MOUSE_PS2_LIFEBOOK all=y
 MOUSE_PS2_TRACKPOINT all=y
 MOUSE_PS2_ELANTECH all=y
+MOUSE_PS2_SENTELIC all=y
 MOUSE_PS2_TOUCHKIT all=y sparc=n
 MOUSE_SERIAL all=m
 MOUSE_APPLETOUCH all=m sparc=n
@@ -1105,6 +1168,7 @@ MOUSE_LOGIBM alpha=m i386=m
 MOUSE_PC110PAD alpha=m i386=m
 MOUSE_VSXXXAA all=m
 MOUSE_GPIO all=m
+MOUSE_SYNAPTICS_I2C all=m
 
 #-
 #- *** FILE: drivers/input/serio/Kconfig ***
@@ -1134,11 +1198,15 @@ TABLET_USB_WACOM all=m
 #-
 INPUT_TOUCHSCREEN all=y
 TOUCHSCREEN_ADS7846 all=m sparc=n
+TOUCHSCREEN_AD7877 all=m
+TOUCHSCREEN_AD7879_I2C all=m
 TOUCHSCREEN_DA9034 all=m
+TOUCHSCREEN_EETI all=m
 TOUCHSCREEN_FUJITSU all=m
 TOUCHSCREEN_GUNZE all=m
 TOUCHSCREEN_ELO all=m
 TOUCHSCREEN_WACOM_W8001 all=m
+TOUCHSCREEN_MCS5000 all=m
 TOUCHSCREEN_MTOUCH all=m
 TOUCHSCREEN_INEXIO all=m
 TOUCHSCREEN_MK712 all=m sparc=n
@@ -1163,19 +1231,28 @@ TOUCHSCREEN_USB_IRTOUCH ia64=y
 TOUCHSCREEN_USB_IDEALTEK ia64=y
 TOUCHSCREEN_USB_GENERAL_TOUCH ia64=y
 TOUCHSCREEN_USB_GOTOP ia64=y
+TOUCHSCREEN_USB_E2I all=y
 TOUCHSCREEN_TOUCHIT213 all=m
 TOUCHSCREEN_TSC2007 all=m
+TOUCHSCREEN_W90X900 all=m
+TOUCHSCREEN_PCAP all=m
 
 #-
 #- *** FILE: drivers/isdn/Kconfig ***
 #-
 ISDN all=y s390=n
+ISDN_I4L all=m
 #- file drivers/isdn/mISDN/Kconfig goes here
-ISDN_I4L all=n ppc=m ppc64=m
 #- file drivers/isdn/i4l/Kconfig goes here
 ISDN_CAPI all=m
 #- file drivers/isdn/capi/Kconfig goes here
 #- file drivers/isdn/hardware/Kconfig goes here
+#- file drivers/isdn/gigaset/Kconfig goes here
+
+#-
+#- *** FILE: drivers/isdn/act2000/Kconfig ***
+#-
+ISDN_DRV_ACT2000 all=m
 
 #-
 #- *** FILE: drivers/isdn/capi/Kconfig ***
@@ -1186,17 +1263,16 @@ ISDN_CAPI_MIDDLEWARE all=y
 ISDN_CAPI_CAPI20 all=m
 ISDN_CAPI_CAPIFS_BOOL all=y
 ISDN_CAPI_CAPIFS all=m
-ISDN_CAPI_CAPIDRV ppc=m ppc64=m
+ISDN_CAPI_CAPIDRV all=m
 
 #-
 #- *** FILE: drivers/isdn/gigaset/Kconfig ***
 #-
-ISDN_DRV_GIGASET ppc=m ppc64=m
-GIGASET_BASE ppc=m ppc64=m
-GIGASET_M105 ppc=m ppc64=m
-GIGASET_M101 ppc=m ppc64=m
-GIGASET_DEBUG ppc=n ppc64=n
-GIGASET_UNDOCREQ ppc=n ppc64=n
+ISDN_DRV_GIGASET all=m
+GIGASET_BASE all=m
+GIGASET_M105 all=m
+GIGASET_M101 all=m
+GIGASET_DEBUG all=n
 
 #-
 #- *** FILE: drivers/isdn/hardware/avm/Kconfig ***
@@ -1229,11 +1305,16 @@ ISDN_DIVAS_MAINT all=m
 MISDN_HFCPCI all=m
 MISDN_HFCMULTI all=m
 MISDN_HFCUSB all=m
+MISDN_AVMFRITZ all=m
+MISDN_SPEEDFAX all=m
+MISDN_INFINEON all=m
+MISDN_W6692 all=m
+MISDN_NETJET all=m
 
 #-
 #- *** FILE: drivers/isdn/hisax/Kconfig ***
 #-
-ISDN_DRV_HISAX ppc=n ppc64=n
+ISDN_DRV_HISAX all=n
 #- D-channel protocol features
 #- HiSax supported cards
 #- HiSax PCMCIA card service modules
@@ -1248,16 +1329,16 @@ HYSDN_CAPI all=y
 #-
 #- *** FILE: drivers/isdn/i4l/Kconfig ***
 #-
-ISDN_PPP ppc=y ppc64=y
-ISDN_PPP_VJ ppc=y ppc64=y
-ISDN_MPP ppc=y ppc64=y
-IPPP_FILTER ppc=y ppc64=y
-ISDN_PPP_BSDCOMP ppc=m ppc64=m
-ISDN_AUDIO ppc=y ppc64=y
-ISDN_TTY_FAX ppc=y ppc64=y
-ISDN_X25 ppc=y ppc64=y
+ISDN_PPP all=y
+ISDN_PPP_VJ all=y
+ISDN_MPP all=y
+IPPP_FILTER all=y
+ISDN_PPP_BSDCOMP all=m
+ISDN_AUDIO all=y
+ISDN_TTY_FAX all=y
+ISDN_X25 all=y
 ISDN_DRV_LOOP all=m
-ISDN_DIVERSION ppc=m ppc64=m
+ISDN_DIVERSION all=m
 #- ISDN4Linux hardware drivers
 #- file drivers/isdn/hisax/Kconfig goes here
 #- file drivers/isdn/icn/Kconfig goes here
@@ -1265,7 +1346,11 @@ ISDN_DIVERSION ppc=m ppc64=m
 #- file drivers/isdn/sc/Kconfig goes here
 #- file drivers/isdn/act2000/Kconfig goes here
 #- file drivers/isdn/hysdn/Kconfig goes here
-#- file drivers/isdn/gigaset/Kconfig goes here
+
+#-
+#- *** FILE: drivers/isdn/icn/Kconfig ***
+#-
+ISDN_DRV_ICN all=m
 
 #-
 #- *** FILE: drivers/isdn/mISDN/Kconfig ***
@@ -1275,6 +1360,16 @@ MISDN_DSP all=m
 MISDN_L1OIP all=m
 #- file drivers/isdn/hardware/mISDN/Kconfig goes here
 
+#-
+#- *** FILE: drivers/isdn/pcbit/Kconfig ***
+#-
+ISDN_DRV_PCBIT all=m
+
+#-
+#- *** FILE: drivers/isdn/sc/Kconfig ***
+#-
+ISDN_DRV_SC all=m
+
 #-
 #- *** FILE: drivers/leds/Kconfig ***
 #-
@@ -1285,19 +1380,28 @@ LEDS_CLASS all=m ppc=y ppc64=y
 LEDS_NET48XX i386=m
 LEDS_WRAP i386=m
 LEDS_ALIX2 all=m
+LEDS_SUNFIRE sparc64=m
 LEDS_PCA9532 all=m
 LEDS_GPIO all=m
+LEDS_GPIO_PLATFORM all=y
+LEDS_GPIO_OF powerpc=y sparc=y
+LEDS_LP3944 all=m
 LEDS_CLEVO_MAIL all=m
 LEDS_PCA955X all=m
+LEDS_WM831X_STATUS all=m
 LEDS_WM8350 all=m
 LEDS_DA903X all=m
+LEDS_DAC124S085 all=m
+LEDS_BD2802 all=m
 #- LED Triggers
 LEDS_TRIGGERS all=y
 LEDS_TRIGGER_TIMER all=m
 LEDS_TRIGGER_IDE_DISK all=y
 LEDS_TRIGGER_HEARTBEAT all=m
 LEDS_TRIGGER_BACKLIGHT all=m
+LEDS_TRIGGER_GPIO all=m
 LEDS_TRIGGER_DEFAULT_ON all=m
+#- iptables trigger is under Netfilter config (LED target)
 
 #-
 #- *** FILE: drivers/lguest/Kconfig ***
@@ -1344,7 +1448,8 @@ MD_RAID0 all=m
 MD_RAID1 all=m
 MD_RAID10 all=m
 MD_RAID456 all=m
-MD_RAID5_RESHAPE all=y
+MULTICORE_RAID456 all=n
+ASYNC_RAID6_TEST all=m
 MD_MULTIPATH all=m
 MD_FAULTY all=m
 BLK_DEV_DM all=m
@@ -1352,14 +1457,18 @@ DM_DEBUG all=n
 DM_CRYPT all=m
 DM_SNAPSHOT all=m
 DM_MIRROR all=m
+DM_LOG_USERSPACE all=m
 DM_ZERO all=m
 DM_MULTIPATH all=m
+DM_MULTIPATH_QL all=m
+DM_MULTIPATH_ST all=m
 DM_DELAY all=m
 DM_UEVENT all=y
 
 #-
 #- *** FILE: drivers/media/Kconfig ***
 #-
+MEDIA_SUPPORT all=m
 #- Multimedia core support
 VIDEO_DEV all=m
 VIDEO_V4L2_COMMON all=m
@@ -1385,11 +1494,12 @@ VIDEO_SAA7146_VV all=m
 #- *** FILE: drivers/media/common/tuners/Kconfig ***
 #-
 MEDIA_ATTACH all=y
-MEDIA_TUNER_CUSTOMIZE all=n
+MEDIA_TUNER_CUSTOMISE all=n
 
 #-
 #- *** FILE: drivers/media/dvb/Kconfig ***
 #-
+DVB_MAX_ADAPTERS all=8
 DVB_DYNAMIC_MINORS all=y
 DVB_CAPTURE_DRIVERS all=y
 #- Supported SAA7146 based PCI Adapters
@@ -1409,6 +1519,8 @@ DVB_CAPTURE_DRIVERS all=y
 #- file drivers/media/dvb/dm1105/Kconfig goes here
 #- Supported FireWire (IEEE 1394) Adapters
 #- file drivers/media/dvb/firewire/Kconfig goes here
+#- Supported Earthsoft PT1 Adapters
+#- file drivers/media/dvb/pt1/Kconfig goes here
 #- Supported DVB Frontends
 #- file drivers/media/dvb/frontends/Kconfig goes here
 
@@ -1460,6 +1572,8 @@ DVB_USB_CINERGY_T2 all=m
 DVB_USB_ANYSEE all=m
 DVB_USB_DTV5100 all=m
 DVB_USB_AF9015 all=m
+DVB_USB_CE6230 all=m
+DVB_USB_FRIIO all=m
 
 #-
 #- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -1531,17 +1645,22 @@ DVB_DUMMY_FE all=m
 #-
 DVB_PLUTO2 all=m sparc=n
 
+#-
+#- *** FILE: drivers/media/dvb/pt1/Kconfig ***
+#-
+DVB_PT1 all=m
+
 #-
 #- *** FILE: drivers/media/dvb/siano/Kconfig ***
 #-
-DVB_SIANO_SMS1XXX all=m
-DVB_SIANO_SMS1XXX_SMS_IDS all=y
+SMS_SIANO_MDTV all=m
+SMS_USB_DRV all=m
+SMS_SDIO_DRV all=m
 
 #-
 #- *** FILE: drivers/media/dvb/ttpci/Kconfig ***
 #-
 DVB_AV7110 all=m sparc=n
-DVB_AV7110_FIRMWARE all=n
 DVB_AV7110_OSD all=y
 DVB_BUDGET_CORE all=m
 DVB_BUDGET all=m sparc=n
@@ -1576,13 +1695,21 @@ RADIO_SF16FMR2 alpha=m i386=m
 RADIO_TERRATEC alpha=m i386=m
 RADIO_TRUST alpha=m i386=m
 RADIO_TYPHOON alpha=m i386=m
-RADIO_TYPHOON_PROC_FS alpha=y i386=y
 RADIO_ZOLTRIX alpha=m i386=m
+I2C_SI4713 all=m
+RADIO_SI4713 all=m
 USB_DSBR all=m
-USB_SI470X all=m
+RADIO_SI470X all=y
+#- file drivers/media/radio/si470x/Kconfig goes here
 USB_MR800 all=m
 RADIO_TEA5764 all=m
 
+#-
+#- *** FILE: drivers/media/radio/si470x/Kconfig ***
+#-
+USB_SI470X all=m
+I2C_SI470X all=m
+
 #-
 #- *** FILE: drivers/media/video/Kconfig ***
 #-
@@ -1608,14 +1735,14 @@ VIDEO_CS53L32A all=m
 VIDEO_WM8775 all=m
 VIDEO_WM8739 all=m
 VIDEO_VP27SMPX ia64=m
+#- RDS decoders
+VIDEO_SAA6588 all=m
 #- Video decoders
 VIDEO_BT819 all=m
 VIDEO_BT856 all=m
 VIDEO_KS0127 all=m
 VIDEO_OV7670 all=m
 VIDEO_SAA7110 all=m
-VIDEO_SAA7111 all=m
-VIDEO_SAA7114 all=m
 VIDEO_SAA711X all=m
 VIDEO_TVP5150 all=m
 VIDEO_VPX3220 all=m
@@ -1633,7 +1760,6 @@ VIDEO_UPD64031A all=m
 VIDEO_UPD64083 all=m
 VIDEO_VIVI all=m
 #- file drivers/media/video/bt8xx/Kconfig goes here
-VIDEO_SAA6588 all=m
 VIDEO_PMS all=m
 VIDEO_BWQCAM all=m
 VIDEO_CQCAM all=m
@@ -1656,14 +1782,13 @@ VIDEO_HEXIUM_GEMINI all=m
 #- file drivers/media/video/au0828/Kconfig goes here
 #- file drivers/media/video/ivtv/Kconfig goes here
 #- file drivers/media/video/cx18/Kconfig goes here
+#- file drivers/media/video/saa7164/Kconfig goes here
 VIDEO_CAFE_CCIC all=m sparc=n
 SOC_CAMERA all=m
 SOC_CAMERA_MT9M001 all=m
-MT9M001_PCA9536_SWITCH all=y
 SOC_CAMERA_MT9M111 all=m
 SOC_CAMERA_MT9T031 all=m
 SOC_CAMERA_MT9V022 all=m
-MT9V022_PCA9536_SWITCH all=y
 SOC_CAMERA_TW9910 all=m
 SOC_CAMERA_PLATFORM all=m
 SOC_CAMERA_OV772X all=m
@@ -1672,7 +1797,9 @@ V4L_USB_DRIVERS all=y sparc=n
 #- file drivers/media/video/uvc/Kconfig goes here
 #- file drivers/media/video/gspca/Kconfig goes here
 #- file drivers/media/video/pvrusb2/Kconfig goes here
+#- file drivers/media/video/hdpvr/Kconfig goes here
 #- file drivers/media/video/em28xx/Kconfig goes here
+#- file drivers/media/video/cx231xx/Kconfig goes here
 #- file drivers/media/video/usbvision/Kconfig goes here
 #- file drivers/media/video/usbvideo/Kconfig goes here
 #- file drivers/media/video/et61x251/Kconfig goes here
@@ -1709,6 +1836,13 @@ VIDEO_CPIA2 all=m
 #-
 VIDEO_CX18 all=m sparc=n
 
+#-
+#- *** FILE: drivers/media/video/cx231xx/Kconfig ***
+#-
+VIDEO_CX231XX all=m
+VIDEO_CX231XX_ALSA all=m
+VIDEO_CX231XX_DVB all=m
+
 #-
 #- *** FILE: drivers/media/video/cx23885/Kconfig ***
 #-
@@ -1746,14 +1880,19 @@ USB_ET61X251 all=m
 USB_GSPCA all=m
 #- file drivers/media/video/gspca/m5602/Kconfig goes here
 #- file drivers/media/video/gspca/stv06xx/Kconfig goes here
+#- file drivers/media/video/gspca/gl860/Kconfig goes here
 USB_GSPCA_CONEX all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
+USB_GSPCA_JEILINJ all=m
 USB_GSPCA_MARS all=m
+USB_GSPCA_MR97310A all=m
 USB_GSPCA_OV519 all=m
 USB_GSPCA_OV534 all=m
 USB_GSPCA_PAC207 all=m
 USB_GSPCA_PAC7311 all=m
+USB_GSPCA_SN9C20X all=m
+USB_GSPCA_SN9C20X_EVDEV all=y
 USB_GSPCA_SONIXB all=m
 USB_GSPCA_SONIXJ all=m
 USB_GSPCA_SPCA500 all=m
@@ -1762,6 +1901,8 @@ USB_GSPCA_SPCA505 all=m
 USB_GSPCA_SPCA506 all=m
 USB_GSPCA_SPCA508 all=m
 USB_GSPCA_SPCA561 all=m
+USB_GSPCA_SQ905 all=m
+USB_GSPCA_SQ905C all=m
 USB_GSPCA_STK014 all=m
 USB_GSPCA_SUNPLUS all=m
 USB_GSPCA_T613 all=m
@@ -1769,6 +1910,11 @@ USB_GSPCA_TV8532 all=m
 USB_GSPCA_VC032X all=m
 USB_GSPCA_ZC3XX all=m
 
+#-
+#- *** FILE: drivers/media/video/gspca/gl860/Kconfig ***
+#-
+USB_GL860 all=m
+
 #-
 #- *** FILE: drivers/media/video/gspca/m5602/Kconfig ***
 #-
@@ -1779,6 +1925,11 @@ USB_M5602 all=m
 #-
 USB_STV06XX all=m
 
+#-
+#- *** FILE: drivers/media/video/hdpvr/Kconfig ***
+#-
+VIDEO_HDPVR all=m
+
 #-
 #- *** FILE: drivers/media/video/ivtv/Kconfig ***
 #-
@@ -1798,6 +1949,7 @@ VIDEO_PVRUSB2_DEBUGIFC all=n
 #-
 USB_PWC all=m
 USB_PWC_DEBUG all=n
+USB_PWC_INPUT_EVDEV all=y
 
 #-
 #- *** FILE: drivers/media/video/saa7134/Kconfig ***
@@ -1806,6 +1958,11 @@ VIDEO_SAA7134 all=m sparc=n
 VIDEO_SAA7134_ALSA all=m
 VIDEO_SAA7134_DVB all=m sparc64=n
 
+#-
+#- *** FILE: drivers/media/video/saa7164/Kconfig ***
+#-
+VIDEO_SAA7164 all=m
+
 #-
 #- *** FILE: drivers/media/video/sn9c102/Kconfig ***
 #-
@@ -1905,12 +2062,17 @@ HTC_PASIC3 all=m
 UCB1400_CORE all=m
 TPS65010 all=m
 TWL4030_CORE powerpc=y
-PMIC_DA903X ppc=y
+PMIC_DA903X powerpc=y
 MFD_WM8400 all=m
+MFD_WM831X all=m
 MFD_WM8350_I2C all=m
 MFD_PCF50633 all=m
+MFD_MC13783 all=m
 PCF50633_ADC all=m
 PCF50633_GPIO all=m
+AB3100_CORE all=m
+AB3100_OTP all=m
+EZX_PCAP all=y
 
 #-
 #- *** FILE: drivers/misc/Kconfig ***
@@ -1928,8 +2090,10 @@ HP_ILO all=m
 SGI_GRU ia64=m x86_64=m
 SGI_GRU_DEBUG ia64=n x86_64=n
 DELL_LAPTOP all=m
+ISL29003 all=m
 #- file drivers/misc/c2port/Kconfig goes here
 #- file drivers/misc/eeprom/Kconfig goes here
+#- file drivers/misc/cb710/Kconfig goes here
 
 #-
 #- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -1937,12 +2101,19 @@ DELL_LAPTOP all=m
 C2PORT all=m
 C2PORT_DURAMAR_2150 all=m
 
+#-
+#- *** FILE: drivers/misc/cb710/Kconfig ***
+#-
+CB710_CORE all=m
+CB710_DEBUG all=n
+
 #-
 #- *** FILE: drivers/misc/eeprom/Kconfig ***
 #-
 EEPROM_AT24 all=m
 EEPROM_AT25 all=m
 EEPROM_LEGACY all=m
+EEPROM_MAX6875 all=m
 EEPROM_93CX6 all=m
 
 #-
@@ -1975,19 +2146,23 @@ MMC_UNSAFE_RESUME all=n
 MMC_SDHCI all=m sparc=n
 MMC_SDHCI_PCI all=m
 MMC_RICOH_MMC all=m
+MMC_SDHCI_OF powerpc=m
+MMC_SDHCI_PLTFM all=m
 MMC_WBSD all=m
 MMC_TIFM_SD all=m
 MMC_SPI all=m
 MMC_SDRICOH_CS all=m
+MMC_CB710 all=m
+MMC_VIA_SDMMC all=m
 
 #-
 #- *** FILE: drivers/mtd/Kconfig ***
 #-
 MTD all=m
 MTD_DEBUG all=n
+MTD_TESTS all=m
 MTD_CONCAT all=m
 MTD_PARTITIONS all=y
-MTD_TESTS all=m
 MTD_REDBOOT_PARTS all=m
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
 MTD_REDBOOT_PARTS_UNALLOCATED all=y
@@ -2055,6 +2230,7 @@ MTD_DATAFLASH_WRITE_VERIFY all=y
 MTD_DATAFLASH_OTP all=y
 MTD_M25P80 all=m ppc=n ppc64=n sparc=n
 M25PXX_USE_FAST_READ all=y
+MTD_SST25L all=m
 MTD_SLRAM all=m
 MTD_PHRAM all=m
 MTD_MTDRAM all=m
@@ -2101,6 +2277,7 @@ MTD_DILNETPC i386=m x86_64=m
 MTD_DILNETPC_BOOTSIZE i386=0x80000 x86_64=0x80000
 MTD_L440GX i386=m x86_64=m
 MTD_PCI all=m
+MTD_GPIO_ADDR all=m
 MTD_INTEL_VR_NOR all=m
 MTD_PLATRAM all=m
 
@@ -2129,6 +2306,7 @@ MTD_NAND_FSL_ELBC ppc=m ppc64=m
 #-
 MTD_ONENAND all=m
 MTD_ONENAND_VERIFY_WRITE all=n sparc=y sparc64=y
+MTD_ONENAND_GENERIC all=m
 MTD_ONENAND_OTP all=n alpha=y i386=y x86_64=y
 MTD_ONENAND_2X_PROGRAM all=y
 MTD_ONENAND_SIM all=m
@@ -2139,7 +2317,7 @@ MTD_ONENAND_SIM all=m
 MTD_UBI all=m sparc=n
 MTD_UBI_WL_THRESHOLD all=4096
 MTD_UBI_BEB_RESERVE all=1
-MTD_UBI_GLUEBI all=n ppc=y ppc64=y
+MTD_UBI_GLUEBI all=n powerpc=m
 #- file drivers/mtd/ubi/Kconfig.debug goes here
 
 #-
@@ -2195,6 +2373,7 @@ ULTRA32 alpha=m i386=m
 SMC9194 alpha=m i386=m
 ENC28J60 all=m
 ENC28J60_WRITEVERIFY all=n
+ETHOC all=m
 NET_VENDOR_RACAL alpha=y i386=y
 NI5010 i386=m
 NI52 alpha=m i386=m
@@ -2250,6 +2429,9 @@ SMSC9420 all=m
 SUNDANCE all=m
 SUNDANCE_MMIO all=n sparc=y sparc64=y
 TLAN all=m sparc=n
+KS8842 all=m
+KS8851 all=m
+KS8851_MLL all=m
 VIA_RHINE all=m
 VIA_RHINE_MMIO all=y alpha=n
 SC92031 all=m
@@ -2260,6 +2442,7 @@ DE620 all=m
 FEC_MPC52xx ppc=m
 FEC_MPC52xx_MDIO ppc=y
 ATL2 all=m
+XILINX_EMACLITE powerpc=m
 #- file drivers/net/fs_enet/Kconfig goes here
 NETDEV_1000 all=y
 ACENIC all=m sparc=n
@@ -2269,8 +2452,8 @@ E1000 all=m sparc=n
 E1000E all=m
 IP1000 all=m
 IGB all=m
-IGB_LRO all=y
 IGB_DCA all=y
+IGBVF all=m
 #- file drivers/net/ixp2000/Kconfig goes here
 MYRI_SBUS sparc=m sparc64=m
 NS83820 all=m
@@ -2285,7 +2468,8 @@ SKY2 all=m sparc=n
 SKY2_DEBUG all=n
 VIA_VELOCITY all=m
 TIGON3 all=m
-BNX2 all=m sparc=n
+BNX2 all=m
+CNIC all=m
 SPIDER_NET ppc64=m
 GELIC_NET ppc64=m
 GELIC_WIRELESS ppc64=y
@@ -2297,6 +2481,7 @@ ATL1 all=m sparc=n
 ATL1E all=m
 ATL1C all=m
 JME all=m
+#- file drivers/net/stmmac/Kconfig goes here
 NETDEV_10000 all=y
 CHELSIO_T1 all=m sparc=n
 CHELSIO_T1_1G all=y
@@ -2307,13 +2492,15 @@ IXGBE_DCA all=y
 IXGBE_DCB all=y
 IXGB all=m sparc=n
 S2IO all=m sparc=n
+VXGE all=m
+VXGE_DEBUG_TRACE_ALL all=n
 MYRI10GE all=m sparc=n
 MYRI10GE_DCA all=y sparc=n
 NETXEN_NIC all=m sparc=n
 NIU all=m
 PASEMI_MAC ppc64=m
 MLX4_EN all=m
-MLX4_CORE all=m sparc=n
+MLX4_CORE all=m
 TEHUTI all=m
 BNX2X all=m
 QLGE all=m
@@ -2326,6 +2513,7 @@ QLGE all=m
 #- file drivers/net/pcmcia/Kconfig goes here
 #- file drivers/net/wan/Kconfig goes here
 #- file drivers/atm/Kconfig goes here
+#- file drivers/ieee802154/Kconfig goes here
 #- file drivers/s390/net/Kconfig goes here
 ISERIES_VETH ppc64=n
 FDDI all=y
@@ -2357,6 +2545,7 @@ NETCONSOLE all=m
 NETCONSOLE_DYNAMIC all=y
 NETPOLL_TRAP all=y
 VIRTIO_NET all=m
+VMXNET3 all=m
 
 #-
 #- *** FILE: drivers/net/appletalk/Kconfig ***
@@ -2395,8 +2584,27 @@ BE2NET all=m
 #- *** FILE: drivers/net/can/Kconfig ***
 #-
 CAN_VCAN all=m
+CAN_DEV all=m
+CAN_CALC_BITTIMING all=y
+#- file drivers/net/can/sja1000/Kconfig goes here
+#- file drivers/net/can/usb/Kconfig goes here
 CAN_DEBUG_DEVICES all=n
 
+#-
+#- *** FILE: drivers/net/can/sja1000/Kconfig ***
+#-
+CAN_SJA1000 all=m
+CAN_SJA1000_ISA all=m
+CAN_SJA1000_PLATFORM all=m
+CAN_SJA1000_OF_PLATFORM powerpc=m
+CAN_EMS_PCI all=m
+CAN_KVASER_PCI all=m
+
+#-
+#- *** FILE: drivers/net/can/usb/Kconfig ***
+#-
+CAN_EMS_USB all=m
+
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
 #-
@@ -2520,6 +2728,7 @@ SMCTR all=m
 #-
 NET_TULIP all=y
 DE2104X all=m
+DE2104X_DSL all=0
 TULIP all=m
 TULIP_MWI all=n
 TULIP_MMIO all=n
@@ -2542,6 +2751,7 @@ USB_RTL8150 all=m
 USB_USBNET all=m
 USB_NET_AX8817X all=m
 USB_NET_CDCETHER all=m
+USB_NET_CDC_EEM all=m
 USB_NET_DM9601 all=m
 USB_NET_SMSC95XX all=m
 USB_NET_GL620A all=m
@@ -2558,6 +2768,8 @@ USB_EPSON2888 all=y ppc=n ppc64=n
 USB_KC2190 all=y
 USB_NET_ZAURUS all=m
 USB_HSO all=m
+USB_NET_INT51X1 all=m
+USB_CDC_PHONET all=m
 
 #-
 #- *** FILE: drivers/net/wan/Kconfig ***
@@ -2611,6 +2823,7 @@ WIMAX_I2400M_DEBUG_LEVEL all=8
 #-
 #- *** FILE: drivers/net/wireless/Kconfig ***
 #-
+WLAN all=y
 WLAN_PRE80211 all=y ppc=n ppc64=n
 STRIP all=m
 ARLAN i386=m
@@ -2623,22 +2836,15 @@ LIBERTAS all=m
 LIBERTAS_USB all=m sparc=
 LIBERTAS_CS all=m
 LIBERTAS_SDIO all=m
+LIBERTAS_SPI all=m
 LIBERTAS_DEBUG all=n
 LIBERTAS_THINFIRM all=m
 LIBERTAS_THINFIRM_USB all=m
 AIRO all=m
-HERMES all=m
-HERMES_CACHE_FW_ON_INIT all=y
-APPLE_AIRPORT ppc=m ppc64=m
-PLX_HERMES all=m
-TMD_HERMES all=m
-NORTEL_HERMES all=m
-PCI_HERMES all=m
-PCMCIA_HERMES all=m
-PCMCIA_SPECTRUM all=m
 ATMEL all=m
 PCI_ATMEL all=m
 PCMCIA_ATMEL all=m
+AT76C50X_USB all=m
 AIRO_CS all=m
 PCMCIA_WL3501 all=m
 PRISM54 all=m
@@ -2648,9 +2854,9 @@ RTL8180 all=m
 RTL8187 all=m
 ADM8211 all=m
 MAC80211_HWSIM all=m
+MWL8K all=m
 #- file drivers/net/wireless/p54/Kconfig goes here
-#- file drivers/net/wireless/ath5k/Kconfig goes here
-#- file drivers/net/wireless/ath9k/Kconfig goes here
+#- file drivers/net/wireless/ath/Kconfig goes here
 #- file drivers/net/wireless/ipw2x00/Kconfig goes here
 #- file drivers/net/wireless/iwlwifi/Kconfig goes here
 #- file drivers/net/wireless/hostap/Kconfig goes here
@@ -2658,15 +2864,31 @@ MAC80211_HWSIM all=m
 #- file drivers/net/wireless/b43legacy/Kconfig goes here
 #- file drivers/net/wireless/zd1211rw/Kconfig goes here
 #- file drivers/net/wireless/rt2x00/Kconfig goes here
+#- file drivers/net/wireless/orinoco/Kconfig goes here
+#- file drivers/net/wireless/wl12xx/Kconfig goes here
+#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/wireless/ath/Kconfig ***
+#-
+ATH_COMMON all=m
+#- file drivers/net/wireless/ath/ath5k/Kconfig goes here
+#- file drivers/net/wireless/ath/ath9k/Kconfig goes here
+#- file drivers/net/wireless/ath/ar9170/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/wireless/ath/ar9170/Kconfig ***
+#-
+AR9170_USB all=m
 
 #-
-#- *** FILE: drivers/net/wireless/ath5k/Kconfig ***
+#- *** FILE: drivers/net/wireless/ath/ath5k/Kconfig ***
 #-
 ATH5K all=m
 ATH5K_DEBUG all=n
 
 #-
-#- *** FILE: drivers/net/wireless/ath9k/Kconfig ***
+#- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
 #-
 ATH9K all=m
 ATH9K_DEBUG all=n
@@ -2676,6 +2898,8 @@ ATH9K_DEBUG all=n
 #-
 B43 all=m
 B43_PCMCIA all=y
+B43_SDIO all=y
+B43_PHY_LP all=y
 B43_DEBUG all=n
 
 #-
@@ -2714,19 +2938,34 @@ LIBIPW_DEBUG all=n
 #-
 #- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
 #-
-IWLCORE all=m
-IWLWIFI_RFKILL all=y
-IWLWIFI_DEBUG all=n
+IWLWIFI all=m
+IWLWIFI_LEDS all=y
+IWLWIFI_SPECTRUM_MEASUREMENT all=y
+IWLWIFI_DEBUG all=y
 IWLAGN all=m
-IWLAGN_SPECTRUM_MEASUREMENT all=y
-IWLAGN_LEDS all=y
 IWL4965 all=y
 IWL5000 all=y
 IWL3945 all=m
-IWL3945_RFKILL all=y
 IWL3945_SPECTRUM_MEASUREMENT all=y
-IWL3945_LEDS all=y
-IWL3945_DEBUG all=n
+
+#-
+#- *** FILE: drivers/net/wireless/iwmc3200wifi/Kconfig ***
+#-
+IWM all=m
+IWM_DEBUG all=n
+
+#-
+#- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
+#-
+HERMES all=m
+HERMES_CACHE_FW_ON_INIT all=y
+APPLE_AIRPORT ppc=m ppc64=m
+PLX_HERMES all=m
+TMD_HERMES all=m
+NORTEL_HERMES all=m
+PCI_HERMES all=m
+PCMCIA_HERMES all=m
+PCMCIA_SPECTRUM all=m
 
 #-
 #- *** FILE: drivers/net/wireless/p54/Kconfig ***
@@ -2734,6 +2973,7 @@ IWL3945_DEBUG all=n
 P54_COMMON all=m
 P54_USB all=m
 P54_PCI all=m
+P54_SPI all=m
 
 #-
 #- *** FILE: drivers/net/wireless/rt2x00/Kconfig ***
@@ -2744,10 +2984,19 @@ RT2500PCI all=m
 RT61PCI all=m
 RT2500USB all=m
 RT73USB all=m
-#- rt2x00 rfkill support disabled due to modularized RFKILL and built-in rt2x00
+RT2800USB all=m
 #- rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00
 RT2X00_DEBUG all=n
 
+#-
+#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#-
+WL12XX all=m
+WL1251 all=m
+WL1251_SPI all=m
+WL1251_SDIO all=m
+WL1271 all=m
+
 #-
 #- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
 #-
@@ -2787,6 +3036,7 @@ PCI_LEGACY all=y
 PCI_DEBUG all=n
 PCI_STUB all=m
 HT_IRQ i386=y x86_64=y
+PCI_IOV all=y
 
 #-
 #- *** FILE: drivers/pci/hotplug/Kconfig ***
@@ -2817,6 +3067,13 @@ PCIEASPM all=n
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
 #-
 PCIEAER all=y
+PCIE_ECRC all=y
+#- file drivers/pci/pcie/aer/Kconfig.debug goes here
+
+#-
+#- *** FILE: drivers/pci/pcie/aer/Kconfig.debug ***
+#-
+PCIEAER_INJECT all=m
 
 #-
 #- *** FILE: drivers/pcmcia/Kconfig ***
@@ -2845,8 +3102,10 @@ PCCARD_NONSTATIC all=m
 #-
 #- *** FILE: drivers/platform/x86/Kconfig ***
 #-
+X86_PLATFORM_DEVICES i386=y x86_64=y
 ACER_WMI all=m
 ASUS_LAPTOP i386=m x86_64=m
+DELL_WMI all=m
 FUJITSU_LAPTOP all=m
 FUJITSU_LAPTOP_DEBUG all=n
 TC1100_WMI all=m
@@ -2859,13 +3118,14 @@ SONYPI_COMPAT i386=y x86_64=y
 THINKPAD_ACPI i386=m x86_64=m
 THINKPAD_ACPI_DEBUGFACILITIES all=n
 THINKPAD_ACPI_DEBUG i386=n x86_64=n
-THINKPAD_ACPI_BAY i386=y x86_64=y
+THINKPAD_ACPI_UNSAFE_LEDS all=n
 THINKPAD_ACPI_VIDEO all=y
 THINKPAD_ACPI_HOTKEY_POLL all=y
 INTEL_MENLOW all=m
 EEEPC_LAPTOP all=m
 ACPI_WMI all=m
 ACPI_ASUS i386=m x86_64=m
+TOPSTAR_LAPTOP all=m
 ACPI_TOSHIBA i386=m x86_64=m
 
 #-
@@ -2902,24 +3162,44 @@ POWER_SUPPLY all=m i386=y ia64=y x86_64=y
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 APM_POWER ppc=m
+WM831X_POWER all=m
 WM8350_POWER all=m
 BATTERY_DS2760 all=m
+BATTERY_DS2782 all=m
 BATTERY_PMU ppc=m
 BATTERY_BQ27x00 all=m
 BATTERY_DA9030 all=m
+BATTERY_MAX17040 all=m
 CHARGER_PCF50633 all=m
 
+#-
+#- *** FILE: drivers/pps/Kconfig ***
+#-
+PPS all=m
+PPS_DEBUG all=n
+
 #-
 #- *** FILE: drivers/regulator/Kconfig ***
 #-
 REGULATOR all=y
 REGULATOR_DEBUG all=n
+REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
+REGULATOR_USERSPACE_CONSUMER all=m
 REGULATOR_BQ24022 all=m
+REGULATOR_MAX1586 all=m
+REGULATOR_TWL4030 powerpc=y
+REGULATOR_WM831X all=m
 REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
+REGULATOR_LP3971 all=m
+REGULATOR_PCAP all=m
+REGULATOR_MC13783 all=m
+REGULATOR_AB3100 all=m
+REGULATOR_TPS65023 all=m
+REGULATOR_TPS6507X all=m
 
 #-
 #- *** FILE: drivers/rtc/Kconfig ***
@@ -2951,6 +3231,7 @@ RTC_DRV_TWL4030 all=m
 RTC_DRV_S35390A all=m
 RTC_DRV_FM3130 all=m
 RTC_DRV_RX8581 all=m
+RTC_DRV_RX8025 all=m
 #- SPI RTC drivers
 RTC_DRV_M41T94 all=m
 RTC_DRV_DS1305 all=m
@@ -2959,22 +3240,28 @@ RTC_DRV_MAX6902 all=m
 RTC_DRV_R9701 all=m
 RTC_DRV_RS5C348 all=m
 RTC_DRV_DS3234 all=m
+RTC_DRV_PCF2123 all=m
 #- Platform RTC drivers
 RTC_DRV_CMOS all=y
 RTC_DRV_DS1286 all=m
 RTC_DRV_DS1511 all=m
 RTC_DRV_DS1553 all=m
 RTC_DRV_DS1742 all=m
+RTC_DRV_EFI ia64=m
 RTC_DRV_STK17TA8 all=m
 RTC_DRV_M48T86 all=m
 RTC_DRV_M48T35 all=m
-RTC_DRV_M48T59 all=m
-RTC_DRV_BQ4802 all=m
+RTC_DRV_M48T59 all=m sparc=y
+RTC_DRV_BQ4802 all=m sparc64=y
 RTC_DRV_V3020 all=m
+RTC_DRV_WM831X all=m
 RTC_DRV_WM8350 all=m
 RTC_DRV_PCF50633 all=m
+RTC_DRV_AB3100 all=m
 #- on-CPU RTC drivers
-RTC_DRV_PPC all=n ppc=y ppc64=y
+RTC_DRV_GENERIC powerpc=y
+RTC_DRV_PS3 ppc64=m
+RTC_DRV_PCAP all=m
 
 #-
 #- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3005,7 +3292,6 @@ BLK_DEV_SR_VENDOR all=y
 CHR_DEV_SG all=m
 CHR_DEV_SCH all=m
 SCSI_ENCLOSURE all=m
-#- Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 SCSI_MULTI_LUN all=y
 SCSI_CONSTANTS all=n
 SCSI_LOGGING all=y
@@ -3022,6 +3308,8 @@ SCSI_SRP_TGT_ATTRS all=y
 SCSI_LOWLEVEL all=y
 ISCSI_TCP all=m
 #- file drivers/scsi/cxgb3i/Kconfig goes here
+#- file drivers/scsi/bnx2i/Kconfig goes here
+#- file drivers/scsi/be2iscsi/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
 SCSI_3W_9XXX all=m
 SCSI_7000FASST alpha=m i386=m
@@ -3034,17 +3322,20 @@ SCSI_AACRAID all=m
 SCSI_AIC7XXX_OLD all=m
 #- file drivers/scsi/aic7xxx/Kconfig.aic79xx goes here
 #- file drivers/scsi/aic94xx/Kconfig goes here
+#- file drivers/scsi/mvsas/Kconfig goes here
 SCSI_DPT_I2O all=m
 SCSI_ADVANSYS all=m
 SCSI_IN2000 alpha=m i386=m
 SCSI_ARCMSR all=m sparc=n
 SCSI_ARCMSR_AER all=y
 #- file drivers/scsi/megaraid/Kconfig.megaraid goes here
+#- file drivers/scsi/mpt2sas/Kconfig goes here
 SCSI_HPTIOP all=m sparc=n
 SCSI_BUSLOGIC all=m
 SCSI_FLASHPOINT i386=n
 LIBFC all=m
 FCOE all=m
+FCOE_FNIC all=m
 SCSI_DMX3191D all=m
 SCSI_DTC3280 alpha=m i386=m
 SCSI_EATA all=m
@@ -3071,7 +3362,6 @@ SCSI_PPA all=m
 SCSI_IMM all=m
 SCSI_IZIP_EPP16 all=n
 SCSI_IZIP_SLOW_CTR all=n
-SCSI_MVSAS all=m
 SCSI_NCR53C406A alpha=m i386=m
 SCSI_NCR_D700 i386=m
 SCSI_STEX all=m sparc=n
@@ -3113,9 +3403,12 @@ SCSI_MESH_RESET_DELAY_MS ppc=4000
 SCSI_MAC53C94 ppc=m
 #- file drivers/scsi/arm/Kconfig goes here
 SCSI_SUNESP sparc=m sparc64=m
+SCSI_PMCRAID all=m
 SCSI_SRP all=m sparc=n
+SCSI_BFA_FC all=m
 #- file drivers/scsi/pcmcia/Kconfig goes here
 #- file drivers/scsi/device_handler/Kconfig goes here
+#- file drivers/scsi/osd/Kconfig goes here
 
 #-
 #- *** FILE: drivers/scsi/aic7xxx/Kconfig.aic79xx ***
@@ -3143,6 +3436,16 @@ AIC7XXX_REG_PRETTY_PRINT all=y
 SCSI_AIC94XX all=m sparc=n
 AIC94XX_DEBUG all=n
 
+#-
+#- *** FILE: drivers/scsi/be2iscsi/Kconfig ***
+#-
+BE2ISCSI all=m
+
+#-
+#- *** FILE: drivers/scsi/bnx2i/Kconfig ***
+#-
+SCSI_BNX2_ISCSI all=m
+
 #-
 #- *** FILE: drivers/scsi/cxgb3i/Kconfig ***
 #-
@@ -3174,6 +3477,27 @@ MEGARAID_MAILBOX all=m
 MEGARAID_LEGACY all=m
 MEGARAID_SAS all=m
 
+#-
+#- *** FILE: drivers/scsi/mpt2sas/Kconfig ***
+#-
+SCSI_MPT2SAS all=m
+SCSI_MPT2SAS_MAX_SGE all=128
+SCSI_MPT2SAS_LOGGING all=y
+
+#-
+#- *** FILE: drivers/scsi/mvsas/Kconfig ***
+#-
+SCSI_MVSAS all=m
+SCSI_MVSAS_DEBUG all=n
+
+#-
+#- *** FILE: drivers/scsi/osd/Kconfig ***
+#-
+SCSI_OSD_INITIATOR all=m
+SCSI_OSD_ULD all=m
+SCSI_OSD_DPRINT_SENSE all=1
+SCSI_OSD_DEBUG all=n
+
 #-
 #- *** FILE: drivers/scsi/pcmcia/Kconfig ***
 #-
@@ -3216,6 +3540,7 @@ SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_MCA i386=m
 #- Non-8250 serial port support
+SERIAL_MAX3100 all=m
 SERIAL_UARTLITE ppc=m
 SERIAL_SUNCORE sparc=y sparc64=y
 SERIAL_SUNZILOG sparc=y sparc64=y
@@ -3240,6 +3565,12 @@ SERIAL_JSM all=m sparc=n
 SERIAL_SGI_IOC4 ia64=m
 SERIAL_SGI_IOC3 ia64=m
 SERIAL_OF_PLATFORM ppc=m ppc64=m
+SERIAL_OF_PLATFORM_NWPSERIAL powerpc=m
+
+#-
+#- *** FILE: drivers/sfi/Kconfig ***
+#-
+SFI all=y
 
 #-
 #- *** FILE: drivers/sn/Kconfig ***
@@ -3267,6 +3598,7 @@ SPI_TLE62X0 all=m
 #-
 SSB all=m
 SSB_PCMCIAHOST all=y
+SSB_SDIOHOST sparc=y
 SSB_DEBUG all=n
 
 #-
@@ -3276,35 +3608,46 @@ STAGING all=y
 STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/et131x/Kconfig goes here
 #- file drivers/staging/slicoss/Kconfig goes here
-#- file drivers/staging/sxg/Kconfig goes here
-#- file drivers/staging/me4000/Kconfig goes here
-#- file drivers/staging/meilhaus/Kconfig goes here
 #- file drivers/staging/go7007/Kconfig goes here
+#- file drivers/staging/cx25821/Kconfig goes here
 #- file drivers/staging/usbip/Kconfig goes here
 #- file drivers/staging/winbond/Kconfig goes here
 #- file drivers/staging/wlan-ng/Kconfig goes here
 #- file drivers/staging/echo/Kconfig goes here
-#- file drivers/staging/at76_usb/Kconfig goes here
 #- file drivers/staging/poch/Kconfig goes here
-#- file drivers/staging/agnx/Kconfig goes here
 #- file drivers/staging/otus/Kconfig goes here
 #- file drivers/staging/rt2860/Kconfig goes here
 #- file drivers/staging/rt2870/Kconfig goes here
+#- file drivers/staging/rt3090/Kconfig goes here
 #- file drivers/staging/comedi/Kconfig goes here
 #- file drivers/staging/asus_oled/Kconfig goes here
 #- file drivers/staging/panel/Kconfig goes here
 #- file drivers/staging/altpciechdma/Kconfig goes here
 #- file drivers/staging/rtl8187se/Kconfig goes here
-#- file drivers/staging/rspiusb/Kconfig goes here
+#- file drivers/staging/rtl8192su/Kconfig goes here
+#- file drivers/staging/rtl8192e/Kconfig goes here
 #- file drivers/staging/mimio/Kconfig goes here
 #- file drivers/staging/frontier/Kconfig goes here
-#- file drivers/staging/epl/Kconfig goes here
 #- file drivers/staging/android/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/agnx/Kconfig ***
-#-
-AGNX all=m
+#- file drivers/staging/dream/Kconfig goes here
+#- file drivers/staging/dst/Kconfig goes here
+#- file drivers/staging/pohmelfs/Kconfig goes here
+#- file drivers/staging/b3dfg/Kconfig goes here
+#- file drivers/staging/phison/Kconfig goes here
+#- file drivers/staging/p9auth/Kconfig goes here
+#- file drivers/staging/line6/Kconfig goes here
+#- file drivers/gpu/drm/radeon/Kconfig goes here
+#- file drivers/staging/octeon/Kconfig goes here
+#- file drivers/staging/serqt_usb2/Kconfig goes here
+#- file drivers/staging/quatech_usb2/Kconfig goes here
+#- file drivers/staging/vt6655/Kconfig goes here
+#- file drivers/staging/vt6656/Kconfig goes here
+#- file drivers/staging/udlfb/Kconfig goes here
+#- file drivers/staging/hv/Kconfig goes here
+#- file drivers/staging/vme/Kconfig goes here
+#- file drivers/staging/rar/Kconfig goes here
+#- file drivers/staging/sep/Kconfig goes here
+#- file drivers/staging/iio/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/altpciechdma/Kconfig ***
@@ -3327,26 +3670,42 @@ ANDROID_LOW_MEMORY_KILLER all=n
 ASUS_OLED all=m
 
 #-
-#- *** FILE: drivers/staging/at76_usb/Kconfig ***
+#- *** FILE: drivers/staging/b3dfg/Kconfig ***
 #-
-USB_ATMEL all=m
+B3DFG all=m
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
 #-
-COMEDI all=m
+COMEDI all=m ppc=n
+COMEDI_DEBUG all=n
 COMEDI_PCI_DRIVERS all=m
+COMEDI_PCMCIA_DRIVERS all=m
 COMEDI_USB_DRIVERS all=m
 
 #-
-#- *** FILE: drivers/staging/echo/Kconfig ***
+#- *** FILE: drivers/staging/cx25821/Kconfig ***
 #-
-ECHO all=m
+VIDEO_CX25821 all=m
+VIDEO_CX25821_ALSA all=m
+
+#-
+#- *** FILE: drivers/staging/dream/Kconfig ***
+#-
+#- file drivers/staging/dream/smd/Kconfig goes here
+#- file drivers/staging/dream/camera/Kconfig goes here
+INPUT_GPIO all=m
+
+#-
+#- *** FILE: drivers/staging/dst/Kconfig ***
+#-
+DST all=m
+DST_DEBUG all=n
 
 #-
-#- *** FILE: drivers/staging/epl/Kconfig ***
+#- *** FILE: drivers/staging/echo/Kconfig ***
 #-
-EPL all=m
+ECHO all=m
 
 #-
 #- *** FILE: drivers/staging/et131x/Kconfig ***
@@ -3365,26 +3724,65 @@ TRANZPORT all=m
 VIDEO_GO7007 all=m
 VIDEO_GO7007_USB all=m
 VIDEO_GO7007_USB_S2250_BOARD all=m
+VIDEO_GO7007_OV7640 all=m
+VIDEO_GO7007_SAA7113 all=m
+VIDEO_GO7007_SAA7115 all=m
+VIDEO_GO7007_TW9903 all=m
+VIDEO_GO7007_UDA1342 all=m
+VIDEO_GO7007_SONY_TUNER all=m
+VIDEO_GO7007_TW2804 all=m
+
+#-
+#- *** FILE: drivers/staging/hv/Kconfig ***
+#-
+HYPERV all=m
+HYPERV_STORAGE all=m
+HYPERV_BLOCK all=m
+HYPERV_NET all=m
+
+#-
+#- *** FILE: drivers/staging/iio/Kconfig ***
+#-
+IIO all=m
+IIO_RING_BUFFER all=y
+IIO_SW_RING all=m
+IIO_TRIGGER all=y
+#- file drivers/staging/iio/accel/Kconfig goes here
+#- file drivers/staging/iio/adc/Kconfig goes here
+#- file drivers/staging/iio/light/Kconfig goes here
+#- file drivers/staging/iio/trigger/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/iio/accel/Kconfig ***
+#-
+#- Accelerometers
+KXSD9 all=m
+LIS3L02DQ all=m
+SCA3000 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/adc/Kconfig ***
+#-
+#- Analog to digital convertors
+MAX1363 all=m
+
+#-
+#- *** FILE: drivers/staging/iio/light/Kconfig ***
+#-
+#- Light sensors
+TSL2561 all=m
 
 #-
-#- *** FILE: drivers/staging/me4000/Kconfig ***
+#- *** FILE: drivers/staging/iio/trigger/Kconfig ***
 #-
-ME4000 all=m
+#- Triggers - standalone
+IIO_PERIODIC_RTC_TRIGGER all=m
+IIO_GPIO_TRIGGER all=m
 
 #-
-#- *** FILE: drivers/staging/meilhaus/Kconfig ***
+#- *** FILE: drivers/staging/line6/Kconfig ***
 #-
-MEILHAUS all=m
-ME0600 all=m
-ME0900 all=m
-ME1000 all=m
-ME1400 all=m
-ME1600 all=m
-ME4600 all=m
-ME6000 all=m
-ME8100 all=m
-ME8200 all=m
-MEDUMMY all=m
+LINE6_USB all=m
 
 #-
 #- *** FILE: drivers/staging/mimio/Kconfig ***
@@ -3396,6 +3794,11 @@ INPUT_MIMIO all=m
 #-
 OTUS all=m
 
+#-
+#- *** FILE: drivers/staging/p9auth/Kconfig ***
+#-
+PLAN9AUTH all=m
+
 #-
 #- *** FILE: drivers/staging/panel/Kconfig ***
 #-
@@ -3404,11 +3807,33 @@ PANEL_PARPORT all=0
 PANEL_PROFILE all=5
 PANEL_CHANGE_MESSAGE all=n
 
+#-
+#- *** FILE: drivers/staging/phison/Kconfig ***
+#-
+IDE_PHISON all=m
+
 #-
 #- *** FILE: drivers/staging/poch/Kconfig ***
 #-
 POCH all=m
 
+#-
+#- *** FILE: drivers/staging/pohmelfs/Kconfig ***
+#-
+POHMELFS all=m
+POHMELFS_DEBUG all=n
+POHMELFS_CRYPTO all=y
+
+#-
+#- *** FILE: drivers/staging/quatech_usb2/Kconfig ***
+#-
+USB_SERIAL_QUATECH_USB2 all=m
+
+#-
+#- *** FILE: drivers/staging/rar/Kconfig ***
+#-
+RAR_REGISTER all=m
+
 #-
 #- *** FILE: drivers/staging/rt2860/Kconfig ***
 #-
@@ -3419,20 +3844,45 @@ RT2860 all=m
 #-
 RT2870 all=m
 
+#-
+#- *** FILE: drivers/staging/rt3090/Kconfig ***
+#-
+RT3090 all=m
+
 #-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
 RTL8187SE all=m
 
+#-
+#- *** FILE: drivers/staging/rtl8192e/Kconfig ***
+#-
+RTL8192E all=m
+
+#-
+#- *** FILE: drivers/staging/rtl8192su/Kconfig ***
+#-
+RTL8192SU all=m
+
+#-
+#- *** FILE: drivers/staging/sep/Kconfig ***
+#-
+DX_SEP all=m
+
+#-
+#- *** FILE: drivers/staging/serqt_usb2/Kconfig ***
+#-
+USB_SERIAL_QUATECH2 all=m
+
 #-
 #- *** FILE: drivers/staging/slicoss/Kconfig ***
 #-
 SLICOSS all=m
 
 #-
-#- *** FILE: drivers/staging/sxg/Kconfig ***
+#- *** FILE: drivers/staging/udlfb/Kconfig ***
 #-
-SXG all=m
+FB_UDL all=m
 
 #-
 #- *** FILE: drivers/staging/usbip/Kconfig ***
@@ -3441,6 +3891,36 @@ USB_IP_COMMON all=m
 USB_IP_VHCI_HCD all=m
 USB_IP_HOST all=m
 
+#-
+#- *** FILE: drivers/staging/vme/Kconfig ***
+#-
+VME_BUS all=m
+#- file drivers/staging/vme/bridges/Kconfig goes here
+#- file drivers/staging/vme/devices/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/vme/bridges/Kconfig ***
+#-
+#- VME Bridge Drivers
+VME_CA91CX42 all=m
+VME_TSI148 all=m
+
+#-
+#- *** FILE: drivers/staging/vme/devices/Kconfig ***
+#-
+#- VME Device Drivers
+VME_USER all=m
+
+#-
+#- *** FILE: drivers/staging/vt6655/Kconfig ***
+#-
+VT6655 all=m
+
+#-
+#- *** FILE: drivers/staging/vt6656/Kconfig ***
+#-
+VT6656 all=m
+
 #-
 #- *** FILE: drivers/staging/winbond/Kconfig ***
 #-
@@ -3471,7 +3951,9 @@ UIO_CIF all=m
 UIO_PDRV all=m
 UIO_PDRV_GENIRQ all=m
 UIO_SMX all=m
+UIO_AEC all=m
 UIO_SERCOS3 all=m
+UIO_PCI_GENERIC all=m
 
 #-
 #- *** FILE: drivers/usb/Kconfig ***
@@ -3543,6 +4025,7 @@ USB_GADGET_ATMEL_USBA ia64=n sparc64=n
 USB_GADGET_FSL_USB2 all=n
 USB_GADGET_LH7A40X all=n
 USB_GADGET_OMAP all=n
+USB_GADGET_R8A66597 all=n
 USB_GADGET_S3C2410 all=n
 USB_GADGET_MUSB_HDRC all=n
 USB_GADGET_M66592 all=n
@@ -3552,12 +4035,15 @@ USB_GADGET_CI13XXX all=n
 USB_GADGET_NET2280 all=y sparc64=n
 USB_NET2280 all=m
 USB_GADGET_GOKU all=n
+USB_GADGET_LANGWELL all=n
 USB_GADGET_DUMMY_HCD all=n
 USB_GADGET_DUALSPEED all=y
 USB_ZERO all=m
 USB_ZERO_HNPTEST all=n
+USB_AUDIO all=m
 USB_ETH all=m
 USB_ETH_RNDIS all=y
+USB_ETH_EEM all=y
 USB_GADGETFS all=m
 USB_FILE_STORAGE all=m
 USB_FILE_STORAGE_TEST all=n
@@ -3571,6 +4057,8 @@ USB_CDC_COMPOSITE all=m
 #-
 #- USB Host Controller Drivers
 USB_C67X00_HCD all=m
+USB_XHCI_HCD all=m
+USB_XHCI_HCD_DEBUGGING all=n
 USB_EHCI_HCD all=m
 USB_EHCI_ROOT_HUB_TT all=y sparc64=n
 USB_EHCI_TT_NEWSCHED all=y
@@ -3580,11 +4068,12 @@ USB_EHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OXU210HP_HCD all=m
 USB_ISP116X_HCD all=m
 USB_ISP1760_HCD all=m
+USB_ISP1362_HCD all=m
 USB_OHCI_HCD all=m
 USB_OHCI_HCD_PPC_SOC ppc=y
-USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PPC_OF_BE ppc=y ppc64=y
 USB_OHCI_HCD_PPC_OF_LE ppc=y ppc64=n
+USB_OHCI_HCD_PPC_OF ppc=y ppc64=y
 USB_OHCI_HCD_PCI ppc=y ppc64=y
 USB_OHCI_HCD_SSB all=y
 USB_OHCI_BIG_ENDIAN_DESC all=n ppc=y ppc64=y
@@ -3620,10 +4109,6 @@ USB_BERRY_CHARGE all=m
 USB_LED all=m
 USB_CYPRESS_CY7C63 all=m
 USB_CYTHERM all=m
-USB_PHIDGET all=m
-USB_PHIDGETKIT all=m
-USB_PHIDGETMOTORCONTROL all=m
-USB_PHIDGETSERVO all=m
 USB_IDMOUSE all=m
 USB_FTDI_ELAN all=m
 USB_APPLEDISPLAY all=m
@@ -3651,7 +4136,7 @@ USB_MON all=m
 #-
 #- Enable Host or Gadget support to see Inventra options
 USB_MUSB_HDRC all=n
-#- DaVinci 644x USB support
+#- DaVinci 35x and 644x USB support
 #- OMAP 243x high speed USB support
 #- OMAP 343x high speed USB support
 #- Blackfin high speed USB Support
@@ -3662,6 +4147,7 @@ USB_MUSB_HDRC all=n
 #- OTG and related infrastructure
 USB_GPIO_VBUS all=m
 TWL4030_USB all=m
+NOP_USB_XCEIV all=m
 
 #-
 #- *** FILE: drivers/usb/serial/Kconfig ***
@@ -3675,7 +4161,7 @@ USB_SERIAL_BELKIN all=m
 USB_SERIAL_CH341 all=m
 USB_SERIAL_WHITEHEAT all=m
 USB_SERIAL_DIGI_ACCELEPORT all=m
-USB_SERIAL_CP2101 all=m
+USB_SERIAL_CP210X all=m
 USB_SERIAL_CYPRESS_M8 all=m
 USB_SERIAL_EMPEG all=m
 USB_SERIAL_FTDI_SIO all=m
@@ -3711,12 +4197,14 @@ USB_SERIAL_MOTOROLA all=m
 USB_SERIAL_NAVMAN all=m
 USB_SERIAL_PL2303 all=m
 USB_SERIAL_OTI6858 all=m
+USB_SERIAL_QUALCOMM all=m
 USB_SERIAL_SPCP8X5 all=m
 USB_SERIAL_HP4X all=m
 USB_SERIAL_SAFE all=m
 USB_SERIAL_SAFE_PADDED all=y
 USB_SERIAL_SIEMENS_MPI all=m
 USB_SERIAL_SIERRAWIRELESS all=m
+USB_SERIAL_SYMBOL all=m
 USB_SERIAL_TI all=m
 USB_SERIAL_CYBERJACK all=m
 USB_SERIAL_XIRCOM all=m
@@ -3728,21 +4216,21 @@ USB_SERIAL_DEBUG all=m
 #-
 #- *** FILE: drivers/usb/storage/Kconfig ***
 #-
-#- NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
-#- see USB_STORAGE Help for more information
+#- NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#- also be needed; see USB_STORAGE Help for more info
 USB_STORAGE all=m
 USB_STORAGE_DEBUG all=n
-USB_STORAGE_DATAFAB all=y
-USB_STORAGE_FREECOM all=y
-USB_STORAGE_ISD200 all=y
-USB_STORAGE_USBAT all=y
-USB_STORAGE_SDDR09 all=y
-USB_STORAGE_SDDR55 all=y
-USB_STORAGE_JUMPSHOT all=y
-USB_STORAGE_ALAUDA all=y
-USB_STORAGE_ONETOUCH all=y
-USB_STORAGE_KARMA all=y
-USB_STORAGE_CYPRESS_ATACB all=y
+USB_STORAGE_DATAFAB all=m
+USB_STORAGE_FREECOM all=m
+USB_STORAGE_ISD200 all=m
+USB_STORAGE_USBAT all=m
+USB_STORAGE_SDDR09 all=m
+USB_STORAGE_SDDR55 all=m
+USB_STORAGE_JUMPSHOT all=m
+USB_STORAGE_ALAUDA all=m
+USB_STORAGE_ONETOUCH all=m
+USB_STORAGE_KARMA all=m
+USB_STORAGE_CYPRESS_ATACB all=m
 USB_LIBUSUAL all=y
 
 #-
@@ -3756,6 +4244,7 @@ USB_WUSB_CBAF_DEBUG all=n
 #- *** FILE: drivers/uwb/Kconfig ***
 #-
 UWB all=m
+UWB_WHCI sparc=m
 UWB_WLP all=m
 UWB_I1480U all=m
 UWB_I1480U_WLP all=m
@@ -3764,6 +4253,7 @@ UWB_I1480U_WLP all=m
 #- *** FILE: drivers/video/Kconfig ***
 #-
 #- file drivers/char/agp/Kconfig goes here
+#- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -3835,7 +4325,6 @@ FB_MATROX_MYSTIQUE all=y sparc64=n
 FB_MATROX_G all=y sparc64=n
 FB_MATROX_I2C all=m
 FB_MATROX_MAVEN all=m
-FB_MATROX_MULTIHEAD all=y sparc64=n
 FB_RADEON all=m ppc=y sparc=n
 FB_RADEON_I2C all=y
 FB_RADEON_BACKLIGHT all=y
@@ -3859,11 +4348,10 @@ FB_NEOMAGIC all=m
 FB_KYRO all=m
 FB_3DFX all=m sparc=n
 FB_3DFX_ACCEL all=y ia64=n sparc64=n
+FB_3DFX_I2C all=y
 FB_VOODOO1 all=m
 FB_VT8623 all=m sparc=n
-FB_CYBLA i386=m
 FB_TRIDENT all=m sparc=n
-FB_TRIDENT_ACCEL all=y sparc64=n
 FB_ARK all=m sparc=n
 FB_PM3 all=m sparc=n
 FB_CARMINE all=m
@@ -3881,6 +4369,7 @@ FB_VIRTUAL all=n
 FB_METRONOME all=m
 FB_MB862XX all=m
 FB_MB862XX_PCI_GDC all=y
+FB_BROADSHEET all=m
 #- file drivers/video/omap/Kconfig goes here
 #- file drivers/video/backlight/Kconfig goes here
 #- file drivers/video/display/Kconfig goes here
@@ -3892,6 +4381,7 @@ FB_MB862XX_PCI_GDC all=y
 #-
 BACKLIGHT_LCD_SUPPORT all=y
 LCD_CLASS_DEVICE all=m
+LCD_LMS283GF05 all=m
 LCD_LTV350QV all=m
 LCD_TDO24M all=m
 LCD_VGG2432A4 all=m
@@ -3903,6 +4393,7 @@ BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
 BACKLIGHT_DA903X all=m
 BACKLIGHT_MBP_NVIDIA all=m
 BACKLIGHT_SAHARA all=m
+BACKLIGHT_WM831X all=m
 
 #-
 #- *** FILE: drivers/video/console/Kconfig ***
@@ -3911,7 +4402,6 @@ VGA_CONSOLE all=y
 VGACON_SOFT_SCROLLBACK all=n ia64=y
 VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 MDA_CONSOLE alpha=m i386=m
-PROM_CONSOLE sparc=y sparc64=y
 DUMMY_CONSOLE all=y
 FRAMEBUFFER_CONSOLE all=y
 FRAMEBUFFER_CONSOLE_DETECT_PRIMARY all=n
@@ -3993,12 +4483,15 @@ WATCHDOG all=y
 WATCHDOG_NOWAYOUT all=n
 #- Watchdog Device Drivers
 SOFT_WATCHDOG all=m
+WM831X_WATCHDOG all=m
 WM8350_WATCHDOG all=m
+TWL4030_WATCHDOG powerpc=m
 ACQUIRE_WDT i386=m x86_64=m
 ADVANTECH_WDT i386=m x86_64=m
 ALIM1535_WDT i386=m x86_64=m
 ALIM7101_WDT all=m
 SC520_WDT i386=m x86_64=m
+SBC_FITPC2_WATCHDOG all=m
 EUROTECH_WDT i386=m x86_64=m
 IB700_WDT i386=m x86_64=m
 IBMASR i386=m x86_64=m
@@ -4033,11 +4526,9 @@ WATCHDOG_RIO sparc64=m
 PCWATCHDOG alpha=m i386=m
 MIXCOMWD alpha=m i386=m
 WDT alpha=m i386=m
-WDT_501 alpha=y i386=y
 #- PCI-based Watchdog Cards
 PCIPCWATCHDOG all=m
 WDTPCI all=m
-WDT_501_PCI all=y
 #- USB-based Watchdog Cards
 USBPCWATCHDOG all=m
 
@@ -4045,6 +4536,7 @@ USBPCWATCHDOG all=m
 #- *** FILE: fs/9p/Kconfig ***
 #-
 9P_FS all=m
+9P_FSCACHE all=y
 
 #-
 #- *** FILE: fs/Kconfig ***
@@ -4056,7 +4548,6 @@ FS_XIP all=y
 #- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
-#- file fs/reiser4/Kconfig goes here
 #- file fs/reiserfs/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
 FS_POSIX_ACL all=y
@@ -4064,17 +4555,16 @@ FS_POSIX_ACL all=y
 #- file fs/gfs2/Kconfig goes here
 #- file fs/ocfs2/Kconfig goes here
 #- file fs/btrfs/Kconfig goes here
+#- file fs/nilfs2/Kconfig goes here
 #- file fs/notify/Kconfig goes here
-QUOTA all=y
-QUOTA_NETLINK_INTERFACE all=y
-PRINT_QUOTA_WARNING all=y
-QFMT_V1 all=m
-QFMT_V2 all=m
-QUOTACTL all=y
+#- file fs/quota/Kconfig goes here
 #- file fs/autofs/Kconfig goes here
 #- file fs/autofs4/Kconfig goes here
 #- file fs/fuse/Kconfig goes here
+CUSE all=m
 GENERIC_ACL all=y
+#- file fs/fscache/Kconfig goes here
+#- file fs/cachefiles/Kconfig goes here
 #- file fs/isofs/Kconfig goes here
 #- file fs/udf/Kconfig goes here
 #- file fs/fat/Kconfig goes here
@@ -4083,13 +4573,12 @@ GENERIC_ACL all=y
 #- file fs/sysfs/Kconfig goes here
 TMPFS all=y
 TMPFS_POSIX_ACL all=y
-HUGETLBFS all=y alpha= sparc=
+HUGETLBFS all=y alpha= sparc= sparc64=y
 #- file fs/configfs/Kconfig goes here
 MISC_FILESYSTEMS all=y
 #- file fs/adfs/Kconfig goes here
 #- file fs/affs/Kconfig goes here
 #- file fs/ecryptfs/Kconfig goes here
-#- file fs/unionfs/Kconfig goes here
 #- file fs/hfs/Kconfig goes here
 #- file fs/hfsplus/Kconfig goes here
 #- file fs/befs/Kconfig goes here
@@ -4107,6 +4596,7 @@ MISC_FILESYSTEMS all=y
 #- file fs/romfs/Kconfig goes here
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
+#- file fs/exofs/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -4152,6 +4642,7 @@ AFFS_FS all=m
 #-
 AFS_FS all=m
 AFS_DEBUG all=n
+AFS_FSCACHE all=y
 
 #-
 #- *** FILE: fs/autofs/Kconfig ***
@@ -4180,6 +4671,13 @@ BFS_FS all=m
 BTRFS_FS all=m
 BTRFS_FS_POSIX_ACL all=y
 
+#-
+#- *** FILE: fs/cachefiles/Kconfig ***
+#-
+CACHEFILES all=m
+CACHEFILES_DEBUG all=n
+CACHEFILES_HISTOGRAM all=n
+
 #-
 #- *** FILE: fs/cifs/Kconfig ***
 #-
@@ -4190,8 +4688,8 @@ CIFS_UPCALL all=y
 CIFS_XATTR all=y
 CIFS_POSIX all=y
 CIFS_DEBUG2 all=n
-CIFS_EXPERIMENTAL all=y
 CIFS_DFS_UPCALL all=n
+CIFS_EXPERIMENTAL all=y
 
 #-
 #- *** FILE: fs/coda/Kconfig ***
@@ -4224,6 +4722,12 @@ ECRYPT_FS all=m
 #-
 EFS_FS all=m
 
+#-
+#- *** FILE: fs/exofs/Kconfig ***
+#-
+EXOFS_FS all=m
+EXOFS_DEBUG all=n
+
 #-
 #- *** FILE: fs/ext2/Kconfig ***
 #-
@@ -4237,6 +4741,7 @@ EXT2_FS_XIP all=y
 #- *** FILE: fs/ext3/Kconfig ***
 #-
 EXT3_FS all=m
+EXT3_DEFAULTS_TO_ORDERED all=n
 EXT3_FS_XATTR all=y
 EXT3_FS_POSIX_ACL all=y
 EXT3_FS_SECURITY all=y
@@ -4245,10 +4750,10 @@ EXT3_FS_SECURITY all=y
 #- *** FILE: fs/ext4/Kconfig ***
 #-
 EXT4_FS all=m
-EXT4DEV_COMPAT all=y
 EXT4_FS_XATTR all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
+EXT4_DEBUG all=n
 
 #-
 #- *** FILE: fs/fat/Kconfig ***
@@ -4264,6 +4769,15 @@ FAT_DEFAULT_IOCHARSET all="iso8859-1"
 #-
 VXFS_FS all=m
 
+#-
+#- *** FILE: fs/fscache/Kconfig ***
+#-
+FSCACHE all=m
+FSCACHE_STATS=y
+FSCACHE_HISTOGRAM all=n
+FSCACHE_DEBUG all=n
+FSCACHE_OBJECT_LIST all=n
+
 #-
 #- *** FILE: fs/fuse/Kconfig ***
 #-
@@ -4273,7 +4787,7 @@ FUSE_FS all=m
 #- *** FILE: fs/gfs2/Kconfig ***
 #-
 GFS2_FS all=m
-GFS2_FS_LOCKING_DLM all=m
+GFS2_FS_LOCKING_DLM all=y
 
 #-
 #- *** FILE: fs/hfs/Kconfig ***
@@ -4364,6 +4878,8 @@ NFS_FS all=m
 NFS_V3 all=y
 NFS_V3_ACL all=y
 NFS_V4 all=y
+NFS_V4_1 all=n
+NFS_FSCACHE all=y
 
 #-
 #- *** FILE: fs/nfsd/Kconfig ***
@@ -4374,6 +4890,11 @@ NFSD_V3 all=y
 NFSD_V3_ACL all=y
 NFSD_V4 all=y
 
+#-
+#- *** FILE: fs/nilfs2/Kconfig ***
+#-
+NILFS2_FS all=m
+
 #-
 #- *** FILE: fs/nls/Kconfig ***
 #-
@@ -4493,6 +5014,16 @@ PROC_SYSCTL all=y
 #-
 QNX4FS_FS all=m
 
+#-
+#- *** FILE: fs/quota/Kconfig ***
+#-
+QUOTA all=y
+QUOTA_NETLINK_INTERFACE all=y
+PRINT_QUOTA_WARNING all=y
+QFMT_V1 all=m
+QFMT_V2 all=m
+QUOTACTL all=y
+
 #-
 #- *** FILE: fs/reiserfs/Kconfig ***
 #-
@@ -4507,6 +5038,7 @@ REISERFS_FS_SECURITY all=y
 #- *** FILE: fs/romfs/Kconfig ***
 #-
 ROMFS_FS all=y
+ROMFS_BACKED_BY_BLOCK all=y
 
 #-
 #- *** FILE: fs/smbfs/Kconfig ***
@@ -4583,8 +5115,10 @@ TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
-CLASSIC_RCU all=y
-TREE_RCU all=n
+TREE_RCU all=y
+RCU_TRACE all=n
+RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
+RCU_FANOUT_EXACT all=n
 IKCONFIG all=m
 IKCONFIG_PROC all=y
 LOG_BUF_SHIFT all=16
@@ -4634,14 +5168,18 @@ SIGNALFD all=y
 TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
+PERF_EVENTS all=y
+EVENT_PROFILE all=y
+PERF_COUNTERS all=y
+DEBUG_PERF_USE_VMALLOC all=n
 VM_EVENT_COUNTERS all=y
 COMPAT_BRK all=n
 SLAB all=n
 SLUB all=y
 SLOB all=n
 PROFILING all=y
-MARKERS all=n
 #- file arch/Kconfig goes here
+SLOW_WORK_DEBUG all=n
 SLABINFO all=y
 RT_MUTEXES all=y
 BASE_SMALL all=0
@@ -4657,11 +5195,11 @@ STOP_MACHINE all=y
 #-
 #- *** FILE: kernel/Kconfig.hz ***
 #-
-HZ_100 all=n alpha= sparc=
-HZ_250 all=n alpha= sparc=
-HZ_300 all=y alpha= sparc=
-HZ_1000 all=n alpha= sparc=
-HZ all=300 alpha=1024 sparc=100
+HZ_100 all=n alpha=
+HZ_250 all=n alpha=
+HZ_300 all=y alpha=
+HZ_1000 all=n alpha=
+HZ all=300 alpha=1024
 
 #-
 #- *** FILE: kernel/Kconfig.preempt ***
@@ -4670,6 +5208,11 @@ PREEMPT_NONE all=n sparc64=y
 PREEMPT_VOLUNTARY all=y sparc64=n
 PREEMPT all=n
 
+#-
+#- *** FILE: kernel/gcov/Kconfig ***
+#-
+GCOV_KERNEL all=n
+
 #-
 #- *** FILE: kernel/power/Kconfig ***
 #-
@@ -4681,10 +5224,8 @@ SUSPEND all=y
 SUSPEND_FREEZER ppc=y ppc64=y
 HIBERNATION all=y
 PM_STD_PARTITION all=""
-#- Image Storage (you need at least one allocator)
-#- General Options
-#- No compression support available without Cryptoapi support.
 APM_EMULATION ppc=m
+PM_RUNTIME all=y
 
 #-
 #- *** FILE: kernel/time/Kconfig ***
@@ -4696,17 +5237,28 @@ HIGH_RES_TIMERS all=y alpha= ia64=
 #-
 #- *** FILE: kernel/trace/Kconfig ***
 #-
+CONTEXT_SWITCH_TRACER all=y
+FTRACE all=y
 FUNCTION_TRACER all=n
 IRQSOFF_TRACER all=n
 SYSPROF_TRACER all=n
 SCHED_TRACER all=n
-CONTEXT_SWITCH_TRACER all=n
+ENABLE_DEFAULT_TRACERS all=n
+FTRACE_SYSCALLS all=n
 BOOT_TRACER all=n
 TRACE_BRANCH_PROFILING all=n
+BRANCH_PROFILE_NONE all=y
+PROFILE_ANNOTATED_BRANCHES all=n
+PROFILE_ALL_BRANCHES all=n
 POWER_TRACER all=n
 STACK_TRACER all=n
 HW_BRANCH_TRACER all=n
+KMEMTRACE all=n
+WORKQUEUE_TRACER all=n
+BLK_DEV_IO_TRACE all=n
 FTRACE_STARTUP_TEST all=n
+MMIOTRACE x86=n
+RING_BUFFER_BENCHMARK all=m
 
 #-
 #- *** FILE: lib/Kconfig ***
@@ -4731,7 +5283,6 @@ TEXTSEARCH all=y
 TEXTSEARCH_KMP all=m
 TEXTSEARCH_BM all=m
 TEXTSEARCH_FSM all=m
-PLIST all=y
 HAS_IOMEM all=y
 HAS_IOPORT all=y
 HAS_DMA all=y
@@ -4745,6 +5296,7 @@ ENABLE_WARN_DEPRECATED all=y
 ENABLE_MUST_CHECK all=y
 FRAME_WARN all=2048
 MAGIC_SYSRQ all=y
+STRIP_ASM_SYMS all=y
 UNUSED_SYMBOLS all=y
 #* required by oprofile
 DEBUG_FS all=y
@@ -4753,6 +5305,8 @@ DEBUG_KERNEL all=y
 DEBUG_SHIRQ all=n
 DETECT_SOFTLOCKUP all=y
 BOOTPARAM_SOFTLOCKUP_PANIC all=n
+DETECT_HUNG_TASK all=y
+BOOTPARAM_HUNG_TASK_PANIC all=n
 SCHED_DEBUG all=n
 SCHEDSTATS all=n
 TIMER_STATS all=y
@@ -4760,6 +5314,7 @@ DEBUG_OBJECTS all=n
 DEBUG_SLAB all=n
 SLUB_DEBUG_ON all=n
 SLUB_STATS all=n
+DEBUG_KMEMLEAK all=n
 DEBUG_RT_MUTEXES all=n
 RT_MUTEX_TESTER all=n
 DEBUG_SPINLOCK all=n
@@ -4771,52 +5326,73 @@ DEBUG_SPINLOCK_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
 DEBUG_KOBJECT all=n
 DEBUG_HIGHMEM i386=n sparc=n
-DEBUG_INFO all=n
+DEBUG_INFO all=y
 DEBUG_VM all=n
 DEBUG_VIRTUAL all=n
 DEBUG_WRITECOUNT all=n
 DEBUG_LIST all=n
 DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
-FRAME_POINTER i386=n x86_64=n
+DEBUG_CREDENTIALS all=n
+FRAME_POINTER i386=y x86_64=y
 BOOT_PRINTK_DELAY all=n
 RCU_TORTURE_TEST all=m
 RCU_CPU_STALL_DETECTOR all=n
 KPROBES_SANITY_TEST all=n
 BACKTRACE_SELF_TEST all=m
 DEBUG_BLOCK_EXT_DEVT all=n
+DEBUG_FORCE_WEAK_PER_CPU all=n
 LKDTM all=m
 FAULT_INJECTION all=n
 LATENCYTOP all=n
 SYSCTL_SYSCALL_CHECK all=n
+#- file mm/Kconfig.debug goes here
 #- file kernel/trace/Kconfig goes here
 PROVIDE_OHCI1394_DMA_INIT all=n
 FIREWIRE_OHCI_REMOTE_DMA all=n
 BUILD_DOCSRC all=n
-DYNAMIC_PRINTK_DEBUG all=n
+DYNAMIC_DEBUG all=n
+DMA_API_DEBUG all=n
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
+#- file lib/Kconfig.kmemcheck goes here
 
 #-
 #- *** FILE: lib/Kconfig.kgdb ***
 #-
-KGDB all=n
+KGDB all=y
+KGDB_SERIAL_CONSOLE all=y
+KGDB_TESTS all=y
+KGDB_TESTS_ON_BOOT all=n
+
+#-
+#- *** FILE: lib/Kconfig.kmemcheck ***
+#-
+KMEMCHECK all=n
 
 #-
 #- *** FILE: mm/Kconfig ***
 #-
-FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y
+FLATMEM_MANUAL all=n alpha=y ppc=y sparc=y sparc64=n
 DISCONTIGMEM_MANUAL all=n
-SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n
+SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n sparc64=y
 SPARSEMEM_VMEMMAP all=y
 MEMORY_HOTPLUG all=y
-#- Memory hotplug is currently incompatible with Software Suspend
 MEMORY_HOTREMOVE all=y
 SPLIT_PTLOCK_CPUS all=4
 MIGRATION all=y
 ZONE_DMA_FLAG all=1 sparc64=0
 NR_QUICK sparc64=1
-UNEVICTABLE_LRU all=y
+KSM all=y
+DEFAULT_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
+MEMORY_FAILURE all=y
+HWPOISON_INJECT all=m
+
+#-
+#- *** FILE: mm/Kconfig.debug ***
+#-
+DEBUG_PAGEALLOC all=n
+PAGE_POISONING sparc=n ia64=n alpha=n
 
 #-
 #- *** FILE: net/8021q/Kconfig ***
@@ -4840,7 +5416,6 @@ NET all=y
 #- file net/unix/Kconfig goes here
 #- file net/xfrm/Kconfig goes here
 #- file net/iucv/Kconfig goes here
-#- file net/ring/Kconfig goes here
 INET all=y
 #- file net/ipv4/Kconfig goes here
 #- file net/ipv6/Kconfig goes here
@@ -4857,6 +5432,7 @@ BRIDGE_NETFILTER all=y
 #- file net/bridge/netfilter/Kconfig goes here
 #- file net/dccp/Kconfig goes here
 #- file net/sctp/Kconfig goes here
+#- file net/rds/Kconfig goes here
 #- file net/tipc/Kconfig goes here
 #- file net/atm/Kconfig goes here
 #- file net/802/Kconfig goes here
@@ -4871,16 +5447,18 @@ BRIDGE_NETFILTER all=y
 #- file net/lapb/Kconfig goes here
 #- file net/econet/Kconfig goes here
 #- file net/wanrouter/Kconfig goes here
+#- file net/phonet/Kconfig goes here
+#- file net/ieee802154/Kconfig goes here
 #- file net/sched/Kconfig goes here
 #- file net/dcb/Kconfig goes here
 NET_PKTGEN all=m
 NET_TCPPROBE all=m
+NET_DROP_MONITOR all=y
 #- file net/ax25/Kconfig goes here
 #- file net/can/Kconfig goes here
 #- file net/irda/Kconfig goes here
 #- file net/bluetooth/Kconfig goes here
 #- file net/rxrpc/Kconfig goes here
-#- file net/phonet/Kconfig goes here
 FIB_RULES all=y
 WIRELESS all=y
 #- file net/wireless/Kconfig goes here
@@ -5008,6 +5586,11 @@ ECONET all=m
 ECONET_AUNUDP all=y
 ECONET_NATIVE all=y
 
+#-
+#- *** FILE: net/ieee802154/Kconfig ***
+#-
+IEEE802154 all=m
+
 #-
 #- *** FILE: net/ipv4/Kconfig ***
 #-
@@ -5038,7 +5621,7 @@ INET_TUNNEL all=m
 INET_XFRM_MODE_TRANSPORT all=m
 INET_XFRM_MODE_TUNNEL all=m
 INET_XFRM_MODE_BEET all=m
-INET_LRO all=m
+INET_LRO all=y
 INET_DIAG all=m
 INET_TCP_DIAG all=m
 TCP_CONG_ADVANCED all=y
@@ -5140,6 +5723,7 @@ LLC2 all=m
 #- *** FILE: net/mac80211/Kconfig ***
 #-
 MAC80211 all=m sparc=n
+#- CFG80211 needs to be enabled for MAC80211
 MAC80211_RC_MINSTREL all=y
 MAC80211_RC_DEFAULT_MINSTREL all=y
 MAC80211_MESH all=y
@@ -5157,6 +5741,7 @@ NETFILTER_XT_MATCH_IPRANGE all=m
 NETFILTER_XT_MATCH_OWNER all=m
 NETFILTER_XT_MATCH_RATEEST all=m
 NETFILTER_XT_MATCH_TIME all=m
+NETFILTER_XT_MATCH_OSF all=m
 #- file net/netfilter/ipvs/Kconfig goes here
 
 #-
@@ -5200,11 +5785,19 @@ PACKET_MMAP all=y
 #-
 PHONET all=m
 
+#-
+#- *** FILE: net/rds/Kconfig ***
+#-
+RDS all=m
+RDS_RDMA all=m
+RDS_TCP all=m
+RDS_DEBUG all=n
+
 #-
 #- *** FILE: net/rfkill/Kconfig ***
 #-
 RFKILL all=m sparc=n
-RFKILL_INPUT all=m sparc=
+RFKILL_INPUT all=y sparc=
 
 #-
 #- *** FILE: net/rxrpc/Kconfig ***
@@ -5283,7 +5876,6 @@ SCTP_HMAC_MD5 all=y
 SUNRPC all=m
 SUNRPC_GSS all=m
 SUNRPC_XPRT_RDMA all=m
-SUNRPC_REGISTER_V4 all=n
 RPCSEC_GSS_KRB5 all=m
 RPCSEC_GSS_SPKM3 all=m
 
@@ -5307,7 +5899,6 @@ WAN_ROUTER all=m
 #-
 #- *** FILE: net/wimax/Kconfig ***
 #-
-#- WiMAX Wireless Broadband support requires CONFIG_INPUT enabled
 WIMAX all=m
 WIMAX_DEBUG_LEVEL all=8
 
@@ -5315,8 +5906,11 @@ WIMAX_DEBUG_LEVEL all=8
 #- *** FILE: net/wireless/Kconfig ***
 #-
 CFG80211 all=m sparc=n
+NL80211_TESTMODE all=y
+CFG80211_DEVELOPER_WARNINGS all=n
 CFG80211_REG_DEBUG all=n
-NL80211 all=y
+CFG80211_DEFAULT_PS all=y
+CFG80211_DEBUGFS all=n
 WIRELESS_OLD_REGULATORY all=y
 WIRELESS_EXT all=y
 WIRELESS_EXT_SYSFS all=y
@@ -5347,7 +5941,6 @@ SAMPLES all=n
 #-
 #- *** FILE: security/Kconfig ***
 #-
-#- file grsecurity/Kconfig goes here
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y
@@ -5355,9 +5948,16 @@ SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
 SECURITY_FILE_CAPABILITIES all=y
-SECURITY_DEFAULT_MMAP_MIN_ADDR all=0
+LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
 #- file security/selinux/Kconfig goes here
 #- file security/smack/Kconfig goes here
+#- file security/tomoyo/Kconfig goes here
+#- file security/integrity/ima/Kconfig goes here
+
+#-
+#- *** FILE: security/integrity/ima/Kconfig ***
+#-
+IMA x86=y ia64=y
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
@@ -5376,10 +5976,16 @@ SECURITY_SELINUX_POLICYDB_VERSION_MAX all=n
 #-
 SECURITY_SMACK all=y
 
+#-
+#- *** FILE: security/tomoyo/Kconfig ***
+#-
+SECURITY_TOMOYO all=y
+
 #-
 #- *** FILE: sound/Kconfig ***
 #-
 SOUND all=m
+SOUND_OSS_CORE_PRECLAIM all=y
 #- file sound/oss/dmasound/Kconfig goes here
 SND all=m
 #- file sound/core/Kconfig goes here
@@ -5389,6 +5995,7 @@ SND all=m
 #- file sound/ppc/Kconfig goes here
 #- file sound/aoa/Kconfig goes here
 #- file sound/arm/Kconfig goes here
+#- file sound/atmel/Kconfig goes here
 #- file sound/spi/Kconfig goes here
 #- file sound/mips/Kconfig goes here
 #- file sound/sh/Kconfig goes here
@@ -5450,6 +6057,7 @@ SND_SUPPORT_OLD_API all=y
 SND_VERBOSE_PROCFS all=y
 SND_VERBOSE_PRINTK all=n
 SND_DEBUG all=n
+#- file sound/core/seq/Kconfig goes here
 
 #-
 #- *** FILE: sound/drivers/Kconfig ***
@@ -5485,7 +6093,6 @@ SND_ALS100 alpha=m i386=m
 SND_AZT2320 alpha=m i386=m
 SND_CMI8330 alpha=m i386=m
 SND_CS4231 alpha=m i386=m
-SND_CS4232 alpha=m i386=m
 SND_CS4236 alpha=m i386=m
 SND_DT019X alpha=m i386=m
 SND_ES968 alpha=m i386=m
@@ -5509,7 +6116,8 @@ SND_SB16_CSP alpha=y i386=y
 SND_SGALAXY alpha=m i386=m
 SND_SSCAPE alpha=m i386=m
 SND_WAVEFRONT alpha=m i386=m
-SND_WAVEFRONT_FIRMWARE_IN_KERNEL alpha=y i386=y
+SND_MSND_PINNACLE i386=m
+SND_MSND_CLASSIC i386=m
 
 #-
 #- *** FILE: sound/oss/Kconfig ***
@@ -5566,7 +6174,8 @@ SND_CS4281 all=m
 SND_CS46XX all=m
 SND_CS46XX_NEW_DSP all=y
 SND_CS5530 alpha=m i386=m ppc=m ppc64=m x86_64=m
-SND_CS5535AUDIO i386=m
+SND_CS5535AUDIO all=m
+SND_CTXFI all=m
 SND_DARLA20 all=m
 SND_GINA20 all=m
 SND_LAYLA20 all=m
@@ -5579,6 +6188,8 @@ SND_ECHO3G all=m
 SND_INDIGO all=m
 SND_INDIGOIO all=m
 SND_INDIGODJ all=m
+SND_INDIGOIOX all=m
+SND_INDIGODJX all=m
 SND_EMU10K1 all=m
 SND_EMU10K1X all=m
 SND_ENS1370 all=m
@@ -5590,6 +6201,7 @@ SND_FM801_TEA575X_BOOL all=y
 SND_FM801_TEA575X all=m
 #- file sound/pci/hda/Kconfig goes here
 SND_HDSP all=m sparc=n
+#- Don't forget to add built-in firmwares for HDSP driver
 SND_HDSPM all=m sparc=n
 SND_HIFIER all=m sparc=n
 SND_ICE1712 all=m
@@ -5597,6 +6209,7 @@ SND_ICE1724 all=m
 SND_INTEL8X0 all=m sparc=n
 SND_INTEL8X0M all=m sparc=m
 SND_KORG1212 all=m
+SND_LX6464ES all=m
 SND_MAESTRO3 all=m
 SND_MIXART all=m
 SND_NM256 all=m
@@ -5619,8 +6232,10 @@ SND_YMFPCI all=m
 #-
 SND_HDA_INTEL all=m sparc=n
 SND_HDA_HWDEP all=y
-SND_HDA_RECONFIG all=n
+SND_HDA_RECONFIG all=y
 SND_HDA_INPUT_BEEP all=y
+SND_HDA_INPUT_JACK all=y
+SND_HDA_PATCH_LOADER all=y
 SND_HDA_CODEC_REALTEK all=y
 SND_HDA_CODEC_ANALOG all=y
 SND_HDA_CODEC_SIGMATEL all=y
@@ -5628,7 +6243,9 @@ SND_HDA_CODEC_VIA all=y
 SND_HDA_CODEC_ATIHDMI all=y
 SND_HDA_CODEC_NVHDMI all=y
 SND_HDA_CODEC_INTELHDMI all=y
+SND_HDA_CODEC_CIRRUS all=y
 SND_HDA_CODEC_CONEXANT all=y
+SND_HDA_CODEC_CA0110 all=y
 SND_HDA_CODEC_CMEDIA all=y
 SND_HDA_CODEC_SI3054 all=y
 SND_HDA_GENERIC all=y
@@ -5659,10 +6276,13 @@ SND_SOC all=m
 #- file sound/soc/blackfin/Kconfig goes here
 #- file sound/soc/davinci/Kconfig goes here
 #- file sound/soc/fsl/Kconfig goes here
+#- file sound/soc/imx/Kconfig goes here
 #- file sound/soc/omap/Kconfig goes here
 #- file sound/soc/pxa/Kconfig goes here
 #- file sound/soc/s3c24xx/Kconfig goes here
+#- file sound/soc/s6000/Kconfig goes here
 #- file sound/soc/sh/Kconfig goes here
+#- file sound/soc/txx9/Kconfig goes here
 #- file sound/soc/codecs/Kconfig goes here
 
 #-
@@ -5674,6 +6294,9 @@ SND_SOC_ALL_CODECS all=m
 #- *** FILE: sound/soc/fsl/Kconfig ***
 #-
 SND_SOC_MPC5200_I2S all=m
+SND_SOC_MPC5200_AC97 powerpc=m
+SND_MPC52xx_SOC_PCM030 powerpc=m
+SND_MPC52xx_SOC_EFIKA powerpc=m
 
 #-
 #- *** FILE: sound/sparc/Kconfig ***