Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

diff --combined arch/arm/Kconfig
index 9773a3f730f3fc8b9759bbb337570eba726c86de,b786e68914d4a20b12b743ee886b9acdbed623d7,167824e24edc127884e63b381b4a0d0151d2e1fa,b786e68914d4a20b12b743ee886b9acdbed623d7,63ef7cf852a73bddecb3c6c3518fd30f6a23aa30,4039a133006e8a2c0af987b99914334a6abac90f,d5a759e700ebd419ad8951e62a161a8682122b5e,5bf60d5897d33dd6e96ec4dcbdf7eecc03fbc16e,b786e68914d4a20b12b743ee886b9acdbed623d7,640df6a4c850a72c7449cf76b1d8e309a0d270ca,b786e68914d4a20b12b743ee886b9acdbed623d7,b786e68914d4a20b12b743ee886b9acdbed623d7..b92925c701726037c427227ceb1b89c377558e74
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
--- 8/arch/arm/Kconfig
--- 9/arch/arm/Kconfig
--- 10/arch/arm/Kconfig
--- 11/arch/arm/Kconfig
--- 12/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@@@@ -8,7 -8,7 -8,7 -8,7 -8,7 -8,6 -8,7 -8,7 -8,7 -8,7 -8,7 -8,7 +8,7 @@@@@@@@@@@@@ mainmenu "Linux Kernel Configuration
            config ARM
                bool
                default y
     +          select HAVE_IDE
                select RTC_LIB
                select SYS_SUPPORTS_APM_EMULATION
                select HAVE_OPROFILE
@@@@@@@@@@@@@ -84,6 -84,6 -84,6 -84,6 -84,6 -83,6 -84,6 -84,11 -84,6 -84,6 -84,6 -84,6 +84,11 @@@@@@@@@@@@@ config STACKTRACE_SUPPOR
                bool
                default y
            
+++++++ ++++config HAVE_LATENCYTOP_SUPPORT
+++++++ ++++    bool
+++++++ ++++    depends on !SMP
+++++++ ++++    default y
+++++++ ++++
            config LOCKDEP_SUPPORT
                bool
                default y
@@@@@@@@@@@@@ -147,6 -147,6 -147,6 -147,6 -147,6 -146,6 -147,10 -152,6 -147,6 -147,6 -147,6 -147,6 +152,10 @@@@@@@@@@@@@ config FI
            config ARCH_MTD_XIP
                bool
            
++++++ +++++config GENERIC_HARDIRQS_NO__DO_IRQ
++++++ +++++    bool
++++++ +++++    def_bool y
++++++ +++++
            if OPROFILE
            
            config OPROFILE_ARMV6
@@@@@@@@@@@@@ -224,6 -224,6 -224,6 -224,6 -224,6 -223,7 -228,6 -229,6 -224,6 -224,6 -224,6 -224,6 +233,6 @@@@@@@@@@@@@ config ARCH_CLPS750
                select TIMER_ACORN
                select ISA
                select NO_IOPORT
     -          select HAVE_IDE
                help
                  Support for the Cirrus Logic PS7500FE system-on-a-chip.
            
@@@@@@@@@@@@@ -232,6 -232,13 -232,13 -232,13 -232,13 -232,14 -236,13 -237,13 -232,13 -232,13 -232,13 -232,13 +241,6 @@@@@@@@@@@@@ config ARCH_CLPS711
                help
                  Support for Cirrus Logic 711x/721x based boards.
            
 -----------config ARCH_CO285
 -----------    bool "Co-EBSA285"
 -----------    select FOOTBRIDGE
 -----------    select FOOTBRIDGE_ADDIN
     -          select HAVE_IDE
 -----------    help
 -----------      Support for Intel's EBSA285 companion chip.
 -----------
            config ARCH_EBSA110
                bool "EBSA-110"
                select ISA
@@@@@@@@@@@@@ -247,13 -254,13 -254,13 -254,13 -254,13 -255,13 -258,13 -259,13 -254,13 -254,13 -254,13 -254,13 +256,13 @@@@@@@@@@@@@ config ARCH_EP93X
                select ARM_AMBA
                select ARM_VIC
                select GENERIC_GPIO
     +          select HAVE_GPIO_LIB
                help
                  This enables support for the Cirrus EP93xx series of CPUs.
            
            config ARCH_FOOTBRIDGE
                bool "FootBridge"
                select FOOTBRIDGE
     -          select HAVE_IDE
                help
                  Support for systems based on the DC21285 companion chip
                  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@@@@@@@@@@@@ -292,6 -299,6 -299,6 -299,6 -299,8 -300,7 -303,6 -304,6 -299,6 -299,6 -299,6 -299,6 +301,8 @@@@@@@@@@@@@ config ARCH_IOP32
                depends on MMU
                select PLAT_IOP
                select PCI
     -          select HAVE_IDE
++++ +++++++    select GENERIC_GPIO
++++ +++++++    select HAVE_GPIO_LIB
                help
                  Support for Intel's 80219 and IOP32X (XScale) family of
                  processors.
@@@@@@@@@@@@@ -301,12 -308,12 -308,12 -308,12 -310,14 -310,14 -312,12 -313,12 -308,12 -308,12 -308,12 -308,12 +312,14 @@@@@@@@@@@@@ config ARCH_IOP33
                depends on MMU
                select PLAT_IOP
                select PCI
     -          select HAVE_IDE
++++ +++++++    select GENERIC_GPIO
++++ +++++++    select HAVE_GPIO_LIB
                help
                  Support for Intel's IOP33X (XScale) family of processors.
            
            config ARCH_IXP23XX
                bool "IXP23XX-based"
                depends on MMU
     -          select HAVE_IDE
                select PCI
                help
                  Support for Intel's IXP23xx (XScale) family of processors.
@@@@@@@@@@@@@ -324,12 -331,12 -331,12 -331,12 -335,12 -335,14 -335,12 -336,12 -331,12 -331,12 -331,12 -331,12 +337,12 @@@@@@@@@@@@@ config ARCH_IXP4X
                select GENERIC_GPIO
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
     -          select HAVE_IDE
                help
                  Support for Intel's IXP4XX (XScale) family of processors.
            
            config ARCH_L7200
                bool "LinkUp-L7200"
                select FIQ
     -          select HAVE_IDE
                help
                  Say Y here if you intend to run this kernel on a LinkUp Systems
                  L7200 Software Development Board which uses an ARM720T processor.
@@@@@@@@@@@@@ -340,6 -347,6 -347,6 -347,6 -351,6 -353,6 -351,6 -352,16 -347,6 -347,6 -347,6 -347,6 +353,16 @@@@@@@@@@@@@
                  If you have any questions or comments about the Linux kernel port
                  to this board, send e-mail to <[email protected]>.
            
+++++++ ++++config ARCH_KIRKWOOD
+++++++ ++++    bool "Marvell Kirkwood"
+++++++ ++++    select PCI
+++++++ ++++    select GENERIC_TIME
+++++++ ++++    select GENERIC_CLOCKEVENTS
+++++++ ++++    select PLAT_ORION
+++++++ ++++    help
+++++++ ++++      Support for the following Marvell Kirkwood series SoCs:
+++++++ ++++      88F6180, 88F6192 and 88F6281.
+++++++ ++++
            config ARCH_KS8695
                bool "Micrel/Kendin KS8695"
                select GENERIC_GPIO
@@@@@@@@@@@@@ -358,23 -365,23 -365,23 -365,23 -369,23 -371,21 -369,23 -380,42 -365,23 -365,23 -365,23 -365,23 +381,42 @@@@@@@@@@@@@ config ARCH_NS9XX
            
                  <http://www.digi.com/products/microprocessors/index.jsp>
            
+++++++ ++++config ARCH_LOKI
+++++++ ++++    bool "Marvell Loki (88RC8480)"
+++++++ ++++    select GENERIC_TIME
+++++++ ++++    select GENERIC_CLOCKEVENTS
+++++++ ++++    select PLAT_ORION
+++++++ ++++    help
+++++++ ++++      Support for the Marvell Loki (88RC8480) SoC.
+++++++ ++++
+++++++ ++++config ARCH_MV78XX0
+++++++ ++++    bool "Marvell MV78xx0"
+++++++ ++++    select PCI
+++++++ ++++    select GENERIC_TIME
+++++++ ++++    select GENERIC_CLOCKEVENTS
+++++++ ++++    select PLAT_ORION
+++++++ ++++    help
+++++++ ++++      Support for the following Marvell MV78xx0 series SoCs:
+++++++ ++++      MV781x0, MV782x0.
+++++++ ++++
            config ARCH_MXC
                bool "Freescale MXC/iMX-based"
                select ARCH_MTD_XIP
                help
                  Support for Freescale MXC/iMX-based family of processors
            
     -      config ARCH_ORION
     +      config ARCH_ORION5X
                bool "Marvell Orion"
                depends on MMU
                select PCI
                select GENERIC_GPIO
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
     +          select PLAT_ORION
                help
     -            Support for Marvell Orion System on Chip family.
     +            Support for the following Marvell Orion 5x series SoCs:
----- - ----      Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)
+++++++ ++++      Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
+++++++ ++++      Orion-2 (5281).
            
            config ARCH_PNX4008
                bool "Philips Nexperia PNX4008 Mobile"
@@@@@@@@@@@@@ -386,6 -393,6 -393,6 -393,6 -397,6 -397,7 -397,6 -427,6 -393,6 -393,6 -393,6 -393,6 +428,6 @@@@@@@@@@@@@ config ARCH_PX
                depends on MMU
                select ARCH_MTD_XIP
                select GENERIC_GPIO
     -          select HAVE_IDE
                select HAVE_GPIO_LIB
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
@@@@@@@@@@@@@ -399,8 -406,8 -406,8 -406,8 -410,8 -411,9 -410,8 -440,8 -406,8 -406,9 -406,8 -406,8 +441,9 @@@@@@@@@@@@@ config ARCH_RP
                select FIQ
                select TIMER_ACORN
                select ARCH_MAY_HAVE_PC_FDC
+++++++++ ++    select HAVE_PATA_PLATFORM
                select ISA_DMA_API
                select NO_IOPORT
     -          select HAVE_IDE
                help
                  On the Acorn Risc-PC, Linux can support the internal IDE disk and
                  CD-ROM interface, serial and parallel port, and the floppy drive.
@@@@@@@@@@@@@ -409,20 -416,20 -416,20 -416,20 -420,20 -422,17 -420,20 -450,20 -416,20 -417,20 -416,20 -416,20 +452,20 @@@@@@@@@@@@@ config ARCH_SA110
                bool "SA1100-based"
                select ISA
                select ARCH_DISCONTIGMEM_ENABLE
     +          select ARCH_SPARSEMEM_ENABLE
     +          select ARCH_SELECT_MEMORY_MODEL
                select ARCH_MTD_XIP
                select GENERIC_GPIO
                select GENERIC_TIME
     -          select HAVE_IDE
     +          select GENERIC_CLOCKEVENTS
     +          select TICK_ONESHOT
     +          select HAVE_GPIO_LIB
                help
                  Support for StrongARM 11x0 based boards.
            
            config ARCH_S3C2410
                bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
                select GENERIC_GPIO
     -          select HAVE_IDE
                help
                  Samsung S3C2410X CPU based systems, such as the Simtec Electronics
                  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@@@@@@@@@@@@ -430,6 -437,6 -437,6 -437,6 -441,6 -440,7 -441,6 -471,6 -437,6 -438,6 -437,6 -437,6 +473,6 @@@@@@@@@@@@@
            
            config ARCH_SHARK
                bool "Shark"
     -          select HAVE_IDE
                select ISA
                select ISA_DMA
                select PCI
@@@@@@@@@@@@@ -439,6 -446,6 -446,6 -446,6 -450,6 -450,7 -450,6 -480,6 -446,6 -447,6 -446,6 -446,6 +482,6 @@@@@@@@@@@@@
            
            config ARCH_LH7A40X
                bool "Sharp LH7A40X"
     -          select HAVE_IDE
                help
                  Say Y here for systems based on one of the Sharp LH7A40X
                  System on a Chip processors.  These CPUs include an ARM922T
@@@@@@@@@@@@@ -456,7 -463,7 -463,7 -463,7 -467,7 -468,6 -467,7 -497,7 -463,7 -464,7 -463,7 -463,7 +499,7 @@@@@@@@@@@@@ config ARCH_DAVINC
            config ARCH_OMAP
                bool "TI OMAP"
                select GENERIC_GPIO
     +          select HAVE_GPIO_LIB
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
                help
@@@@@@@@@@@@@ -495,6 -502,6 -502,6 -502,6 -506,6 -506,6 -506,6 -536,10 -502,6 -503,6 -502,6 -502,6 +538,10 @@@@@@@@@@@@@ source "arch/arm/mach-ixp2000/Kconfig
            
            source "arch/arm/mach-ixp23xx/Kconfig"
            
+++++++ ++++source "arch/arm/mach-loki/Kconfig"
+++++++ ++++
+++++++ ++++source "arch/arm/mach-mv78xx0/Kconfig"
+++++++ ++++
            source "arch/arm/mach-pxa/Kconfig"
            
            source "arch/arm/mach-sa1100/Kconfig"
@@@@@@@@@@@@@ -505,8 -512,8 -512,8 -512,8 -516,8 -516,8 -516,8 -550,10 -512,8 -513,8 -512,8 -512,8 +552,10 @@@@@@@@@@@@@ source "arch/arm/mach-omap1/Kconfig
            
            source "arch/arm/mach-omap2/Kconfig"
            
     -      source "arch/arm/mach-orion/Kconfig"
     +      source "arch/arm/mach-orion5x/Kconfig"
     +      
+++++++ ++++source "arch/arm/mach-kirkwood/Kconfig"
+++++ + ++++
            source "arch/arm/plat-s3c24xx/Kconfig"
            source "arch/arm/plat-s3c/Kconfig"
            
@@@@@@@@@@@@@ -552,9 -559,9 -559,9 -559,9 -563,9 -563,6 -563,9 -599,9 -559,9 -560,9 -559,9 -559,9 +601,9 @@@@@@@@@@@@@ config ARCH_ACOR
            config PLAT_IOP
                bool
            
     +      config PLAT_ORION
     +          bool
     +      
            source arch/arm/mm/Kconfig
            
            config IWMMXT
@@@@@@@@@@@@@ -642,7 -649,7 -649,7 -649,7 -653,7 -650,7 -653,7 -689,7 -649,7 -650,7 -649,7 -649,7 +691,7 @@@@@@@@@@@@@ source "kernel/time/Kconfig
            
            config SMP
                bool "Symmetric Multi-Processing (EXPERIMENTAL)"
     -          depends on EXPERIMENTAL && REALVIEW_EB_ARM11MP
     +          depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
                help
                  This enables support for systems with more than one CPU. If you have
                  a system with only one CPU, like most personal computers, say N. If
@@@@@@@@@@@@@ -675,7 -682,7 -682,7 -682,7 -686,7 -683,7 -686,7 -722,7 -682,7 -683,7 -682,7 -682,7 +724,7 @@@@@@@@@@@@@ config HOTPLUG_CP
            
            config LOCAL_TIMERS
                bool "Use local timer interrupts"
     -          depends on SMP && REALVIEW_EB_ARM11MP
     +          depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
                default y
                help
                  Enable support for local timers on SMP platforms, rather then the
@@@@@@@@@@@@@ -696,27 -703,27 -703,6 -703,27 -707,27 -704,27 -707,27 -743,27 -703,27 -704,27 -703,27 -703,27 +745,6 @@@@@@@@@@@@@ config PREEMP
                  Say Y here if you are building a kernel for a desktop, embedded
                  or real-time system.  Say N if you are unsure.
            
-- ---------config NO_IDLE_HZ
-- ---------    bool "Dynamic tick timer"
-- ---------    depends on !GENERIC_CLOCKEVENTS
-- ---------    help
-- ---------      Select this option if you want to disable continuous timer ticks
-- ---------      and have them programmed to occur as required. This option saves
-- ---------      power as the system can remain in idle state for longer.
-- ---------
-- ---------      By default dynamic tick is disabled during the boot, and can be
-- ---------      manually enabled with:
-- ---------
-- ---------        echo 1 > /sys/devices/system/timer/timer0/dyn_tick
-- ---------
-- ---------      Alternatively, if you want dynamic tick automatically enabled
-- ---------      during boot, pass "dyntick=enable" via the kernel command string.
-- ---------
-- ---------      Please note that dynamic tick may affect the accuracy of
-- ---------      timekeeping on some platforms depending on the implementation.
-- ---------      Currently at least OMAP, PXA2xx and SA11x0 platforms are known
-- ---------      to have accurate timekeeping with dynamic tick.
-- ---------
            config HZ
                int
                default 128 if ARCH_L7200
@@@@@@@@@@@@@ -766,12 -773,12 -752,12 -773,12 -777,12 -774,6 -777,12 -813,12 -773,12 -774,12 -773,12 -773,12 +794,12 @@@@@@@@@@@@@ config ARCH_DISCONTIGMEM_ENABL
                  or have huge holes in the physical address space for other reasons.
                  See <file:Documentation/vm/numa> for more.
            
     +      config ARCH_SPARSEMEM_ENABLE
     +          bool
     +      
     +      config ARCH_SELECT_MEMORY_MODEL
     +          bool
     +      
            config NODES_SHIFT
                int
                default "4" if ARCH_LH7A40X
@@@@@@@@@@@@@ -782,7 -789,7 -768,7 -789,7 -793,7 -784,7 -793,7 -829,7 -789,7 -790,7 -789,7 -789,7 +810,7 @@@@@@@@@@@@@ source "mm/Kconfig
            
            config LEDS
                bool "Timer and CPU usage LEDs"
 -----------    depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
 +++++++++++    depends on ARCH_CDB89712 || ARCH_EBSA110 || \
                           ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
                           ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                           ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
@@@@@@@@@@@@@ -1172,8 -1179,8 -1158,8 -1179,8 -1183,8 -1174,6 -1183,8 -1219,8 -1179,8 -1180,8 -1179,8 -1179,8 +1200,8 @@@@@@@@@@@@@ source "drivers/dma/Kconfig
            
            source "drivers/dca/Kconfig"
            
     +      source "drivers/uio/Kconfig"
     +      
            endmenu
            
            source "fs/Kconfig"

diff --combined arch/arm/Makefile
index 1c840639f8282782170e50bee9edcf6e22e807e0,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362,1a4649667ec8d420a541ee55c9a88c9b4bf8d5d8,1d74342d09c0c96062ebf3197b5f4fde8a7f90a9,b53237bb6f13d99d3131d2fe1891ea1640780054,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362,e72db27e0ba074e599d9eda4101c417c19f78362..91fac81833e810a3e4be65e34fd00de10e671798
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
--- 3/arch/arm/Makefile
--- 4/arch/arm/Makefile
--- 5/arch/arm/Makefile
--- 6/arch/arm/Makefile
--- 7/arch/arm/Makefile
--- 8/arch/arm/Makefile
--- 9/arch/arm/Makefile
--- 10/arch/arm/Makefile
--- 11/arch/arm/Makefile
--- 12/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@@@@@@@@@@@ -100,6 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 -100,8 +100,6 @@@@@@@@@@@@@ textofs-y        := 0x0000800
              incdir-$(CONFIG_ARCH_CLPS7500)   := cl7500
             machine-$(CONFIG_FOOTBRIDGE)          := footbridge
              incdir-$(CONFIG_FOOTBRIDGE)          := ebsa285
 ----------- machine-$(CONFIG_ARCH_CO285)          := footbridge
 -----------  incdir-$(CONFIG_ARCH_CO285)          := ebsa285
             machine-$(CONFIG_ARCH_SHARK)          := shark
             machine-$(CONFIG_ARCH_SA1100)         := sa1100
            ifeq ($(CONFIG_ARCH_SA1100),y)
@@@@@@@@@@@@@ -132,12 -134,12 -134,12 -134,12 -134,12 -134,13 -134,12 -134,15 -134,12 -134,12 -134,12 -134,12 +132,15 @@@@@@@@@@@@@ endi
             machine-$(CONFIG_ARCH_PNX4008)        := pnx4008
             machine-$(CONFIG_ARCH_NETX)           := netx
             machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx
     -       textofs-$(CONFIG_ARCH_NS9XXX)         := 0x00108000
             machine-$(CONFIG_ARCH_DAVINCI)        := davinci
+++++++ ++++ machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood
             machine-$(CONFIG_ARCH_KS8695)     := ks8695
              incdir-$(CONFIG_ARCH_MXC)    := mxc
             machine-$(CONFIG_ARCH_MX3)    := mx3
     -       machine-$(CONFIG_ARCH_ORION)          := orion
     +       machine-$(CONFIG_ARCH_ORION5X)        := orion5x
             machine-$(CONFIG_ARCH_MSM7X00A)   := msm
+++++++ ++++ machine-$(CONFIG_ARCH_LOKI)       := loki
+++++++ ++++ machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0
            
            ifeq ($(CONFIG_ARCH_EBSA110),y)
            # This is what happens if you forget the IOCS16 line.
@@@@@@@@@@@@@ -182,14 -184,14 -184,14 -184,14 -184,14 -185,13 -184,12 -187,14 -184,14 -184,14 -184,14 -184,14 +185,12 @@@@@@@@@@@@@ core-$(CONFIG_VFP)          += arch/arm/vfp
            
            # If we have a common platform directory, then include it in the build.
            core-$(CONFIG_PLAT_IOP)             += arch/arm/plat-iop/
     +      core-$(CONFIG_PLAT_ORION)           += arch/arm/plat-orion/
            core-$(CONFIG_ARCH_OMAP)    += arch/arm/plat-omap/
            core-$(CONFIG_PLAT_S3C24XX)         += arch/arm/plat-s3c24xx/
            core-$(CONFIG_ARCH_MXC)             += arch/arm/plat-mxc/
            
            drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/
------ -----drivers-$(CONFIG_ARCH_CLPS7500)     += drivers/acorn/char/
------ -----drivers-$(CONFIG_ARCH_L7200)        += drivers/acorn/char/
            
            libs-y                              := arch/arm/lib/ $(libs-y)
            

diff --combined arch/arm/configs/at91cap9adk_defconfig
index e32e73648129d36ac9726b10d2723b7d38e918db,47e722511bdfb0ea21f04de94ba805d63edc22ea,b8e73e95598d244991272b80d05a31964ae9ec00,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db,e32e73648129d36ac9726b10d2723b7d38e918db..be2b2f38fd94912642b59b706ee4edadcfd40bf1
--- 1/arch/arm/configs/at91cap9adk_defconfig
--- 2/arch/arm/configs/at91cap9adk_defconfig
--- 3/arch/arm/configs/at91cap9adk_defconfig
--- 4/arch/arm/configs/at91cap9adk_defconfig
--- 5/arch/arm/configs/at91cap9adk_defconfig
--- 6/arch/arm/configs/at91cap9adk_defconfig
--- 7/arch/arm/configs/at91cap9adk_defconfig
--- 8/arch/arm/configs/at91cap9adk_defconfig
--- 9/arch/arm/configs/at91cap9adk_defconfig
--- 10/arch/arm/configs/at91cap9adk_defconfig
--- 11/arch/arm/configs/at91cap9adk_defconfig
--- 12/arch/arm/configs/at91cap9adk_defconfig
+++ b/arch/arm/configs/at91cap9adk_defconfig
@@@@@@@@@@@@@ -213,7 -213,7 -213,6 -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 -213,7 +213,6 @@@@@@@@@@@@@ CONFIG_CPU_CP15_MMU=
            #
            # CONFIG_TICK_ONESHOT is not set
            # CONFIG_PREEMPT is not set
-- ---------# CONFIG_NO_IDLE_HZ is not set
            CONFIG_HZ=100
            CONFIG_AEABI=y
            CONFIG_OABI_COMPAT=y
@@@@@@@@@@@@@ -907,7 -907,32 -906,7 -907,7 -907,7 -907,7 -907,7 -907,7 -907,7 -907,7 -907,7 -907,7 +906,32 @@@@@@@@@@@@@ CONFIG_USB_MON=
            #
            # USB Gadget Support
            #
- ----------# CONFIG_USB_GADGET is not set
+ ++++++++++CONFIG_USB_GADGET=y
+ ++++++++++# CONFIG_USB_GADGET_DEBUG is not set
+ ++++++++++# CONFIG_USB_GADGET_DEBUG_FILES is not set
+ ++++++++++CONFIG_USB_GADGET_SELECTED=y
+ ++++++++++# CONFIG_USB_GADGET_AMD5536UDC is not set
+ ++++++++++CONFIG_USB_GADGET_ATMEL_USBA=y
+ ++++++++++CONFIG_USB_ATMEL_USBA=y
+ ++++++++++# CONFIG_USB_GADGET_FSL_USB2 is not set
+ ++++++++++# CONFIG_USB_GADGET_NET2280 is not set
+ ++++++++++# CONFIG_USB_GADGET_PXA2XX is not set
+ ++++++++++# CONFIG_USB_GADGET_M66592 is not set
+ ++++++++++# CONFIG_USB_GADGET_GOKU is not set
+ ++++++++++# CONFIG_USB_GADGET_LH7A40X is not set
+ ++++++++++# CONFIG_USB_GADGET_OMAP is not set
+ ++++++++++# CONFIG_USB_GADGET_S3C2410 is not set
+ ++++++++++# CONFIG_USB_GADGET_AT91 is not set
+ ++++++++++# CONFIG_USB_GADGET_DUMMY_HCD is not set
+ ++++++++++CONFIG_USB_GADGET_DUALSPEED=y
+ ++++++++++# CONFIG_USB_ZERO is not set
+ ++++++++++CONFIG_USB_ETH=m
+ ++++++++++CONFIG_USB_ETH_RNDIS=y
+ ++++++++++# CONFIG_USB_GADGETFS is not set
+ ++++++++++CONFIG_USB_FILE_STORAGE=m
+ ++++++++++# CONFIG_USB_FILE_STORAGE_TEST is not set
+ ++++++++++# CONFIG_USB_G_SERIAL is not set
+ ++++++++++# CONFIG_USB_MIDI_GADGET is not set
            CONFIG_MMC=y
            # CONFIG_MMC_DEBUG is not set
            # CONFIG_MMC_UNSAFE_RESUME is not set
@@@@@@@@@@@@@ -926,7 -951,59 -925,7 -926,7 -926,7 -926,7 -926,7 -926,7 -926,7 -926,7 -926,7 -926,7 +950,59 @@@@@@@@@@@@@ CONFIG_MMC_AT91=
            # CONFIG_MMC_SPI is not set
            # CONFIG_NEW_LEDS is not set
            CONFIG_RTC_LIB=y
- ----------# CONFIG_RTC_CLASS is not set
+ ++++++++++CONFIG_RTC_CLASS=y
+ ++++++++++CONFIG_RTC_HCTOSYS=y
+ ++++++++++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+ ++++++++++# CONFIG_RTC_DEBUG is not set
+ ++++++++++
+ ++++++++++#
+ ++++++++++# RTC interfaces
+ ++++++++++#
+ ++++++++++CONFIG_RTC_INTF_SYSFS=y
+ ++++++++++CONFIG_RTC_INTF_PROC=y
+ ++++++++++CONFIG_RTC_INTF_DEV=y
+ ++++++++++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+ ++++++++++# CONFIG_RTC_DRV_TEST is not set
+ ++++++++++
+ ++++++++++#
+ ++++++++++# I2C RTC drivers
+ ++++++++++#
+ ++++++++++# CONFIG_RTC_DRV_DS1307 is not set
+ ++++++++++# CONFIG_RTC_DRV_DS1374 is not set
+ ++++++++++# CONFIG_RTC_DRV_DS1672 is not set
+ ++++++++++# CONFIG_RTC_DRV_MAX6900 is not set
+ ++++++++++# CONFIG_RTC_DRV_RS5C372 is not set
+ ++++++++++# CONFIG_RTC_DRV_ISL1208 is not set
+ ++++++++++# CONFIG_RTC_DRV_X1205 is not set
+ ++++++++++# CONFIG_RTC_DRV_PCF8563 is not set
+ ++++++++++# CONFIG_RTC_DRV_PCF8583 is not set
+ ++++++++++# CONFIG_RTC_DRV_M41T80 is not set
+ ++++++++++
+ ++++++++++#
+ ++++++++++# SPI RTC drivers
+ ++++++++++#
+ ++++++++++# CONFIG_RTC_DRV_MAX6902 is not set
+ ++++++++++# CONFIG_RTC_DRV_R9701 is not set
+ ++++++++++# CONFIG_RTC_DRV_RS5C348 is not set
+ ++++++++++
+ ++++++++++#
+ ++++++++++# Platform RTC drivers
+ ++++++++++#
+ ++++++++++# CONFIG_RTC_DRV_CMOS is not set
+ ++++++++++# CONFIG_RTC_DRV_DS1511 is not set
+ ++++++++++# CONFIG_RTC_DRV_DS1553 is not set
+ ++++++++++# CONFIG_RTC_DRV_DS1742 is not set
+ ++++++++++# CONFIG_RTC_DRV_STK17TA8 is not set
+ ++++++++++# CONFIG_RTC_DRV_M48T86 is not set
+ ++++++++++# CONFIG_RTC_DRV_M48T59 is not set
+ ++++++++++# CONFIG_RTC_DRV_V3020 is not set
+ ++++++++++
+ ++++++++++#
+ ++++++++++# on-CPU RTC drivers
+ ++++++++++#
+ ++++++++++CONFIG_RTC_DRV_AT91SAM9=y
+ ++++++++++CONFIG_RTC_DRV_AT91SAM9_RTT=0
+ ++++++++++CONFIG_RTC_DRV_AT91SAM9_GPBR=0
            
            #
            # File systems

diff --combined arch/arm/configs/s3c2410_defconfig
index f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,6d03763773bf336305aad6a32160c18c96d549b0,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,f8a1645b3d4affd925eb2dfaaf85cd1d1db995a4,3796397fde20edf16fc20cfe32b624fafa7a517d..35faaea8623e43f3e47a86de92255a09184d8724
--- 1/arch/arm/configs/s3c2410_defconfig
--- 2/arch/arm/configs/s3c2410_defconfig
--- 3/arch/arm/configs/s3c2410_defconfig
--- 4/arch/arm/configs/s3c2410_defconfig
--- 5/arch/arm/configs/s3c2410_defconfig
--- 6/arch/arm/configs/s3c2410_defconfig
--- 7/arch/arm/configs/s3c2410_defconfig
--- 8/arch/arm/configs/s3c2410_defconfig
--- 9/arch/arm/configs/s3c2410_defconfig
--- 10/arch/arm/configs/s3c2410_defconfig
--- 11/arch/arm/configs/s3c2410_defconfig
--- 12/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@@@@@@@@@@@@ -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,15 -1,18 +1,18 @@@@@@@@@@@@@
            #
            # Automatically generated make config: don't edit
----------- # Linux kernel version: 2.6.21-rc6
----------- # Mon Apr  9 10:12:58 2007
+++++++++++ # Linux kernel version: 2.6.26-rc8
+++++++++++ # Mon Jul  7 16:59:23 2008
            #
            CONFIG_ARM=y
            CONFIG_SYS_SUPPORTS_APM_EMULATION=y
            CONFIG_GENERIC_GPIO=y
            # CONFIG_GENERIC_TIME is not set
+++++++++++ # CONFIG_GENERIC_CLOCKEVENTS is not set
            CONFIG_MMU=y
            CONFIG_NO_IOPORT=y
            CONFIG_GENERIC_HARDIRQS=y
+++++++++++ CONFIG_STACKTRACE_SUPPORT=y
+++++++++++ CONFIG_LOCKDEP_SUPPORT=y
            CONFIG_TRACE_IRQFLAGS_SUPPORT=y
            CONFIG_HARDIRQS_SW_RESEND=y
            CONFIG_GENERIC_IRQ_PROBE=y
@@@@@@@@@@@@@ -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -18,34 -21,39 +21,39 @@@@@@@@@@@@@ CONFIG_RWSEM_GENERIC_SPINLOCK=
            # CONFIG_ARCH_HAS_ILOG2_U64 is not set
            CONFIG_GENERIC_HWEIGHT=y
            CONFIG_GENERIC_CALIBRATE_DELAY=y
+++++++++++ CONFIG_ARCH_SUPPORTS_AOUT=y
            CONFIG_ZONE_DMA=y
            CONFIG_VECTORS_BASE=0xffff0000
            CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
            
            #
----------- # Code maturity level options
+++++++++++ # General setup
            #
            CONFIG_EXPERIMENTAL=y
            CONFIG_BROKEN_ON_SMP=y
            CONFIG_INIT_ENV_ARG_LIMIT=32
----------- 
----------- #
----------- # General setup
----------- #
            CONFIG_LOCALVERSION=""
            CONFIG_LOCALVERSION_AUTO=y
            CONFIG_SWAP=y
            CONFIG_SYSVIPC=y
----------- # CONFIG_IPC_NS is not set
            CONFIG_SYSVIPC_SYSCTL=y
            # CONFIG_POSIX_MQUEUE is not set
            # CONFIG_BSD_PROCESS_ACCT is not set
            # CONFIG_TASKSTATS is not set
----------- # CONFIG_UTS_NS is not set
            # CONFIG_AUDIT is not set
----------- # CONFIG_IKCONFIG is not set
+++++++++++ CONFIG_IKCONFIG=m
+++++++++++ CONFIG_IKCONFIG_PROC=y
+++++++++++ CONFIG_LOG_BUF_SHIFT=16
+++++++++++ # CONFIG_CGROUPS is not set
+++++++++++ # CONFIG_GROUP_SCHED is not set
            CONFIG_SYSFS_DEPRECATED=y
+++++++++++ CONFIG_SYSFS_DEPRECATED_V2=y
            # CONFIG_RELAY is not set
+++++++++++ CONFIG_NAMESPACES=y
+++++++++++ # CONFIG_UTS_NS is not set
+++++++++++ # CONFIG_IPC_NS is not set
+++++++++++ # CONFIG_USER_NS is not set
+++++++++++ # CONFIG_PID_NS is not set
            CONFIG_BLK_DEV_INITRD=y
            CONFIG_INITRAMFS_SOURCE=""
            CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@@@@@@@@@@@@ -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -53,6 -61,7 +61,7 @@@@@@@@@@@@@ CONFIG_SYSCTL=
            # CONFIG_EMBEDDED is not set
            CONFIG_UID16=y
            CONFIG_SYSCTL_SYSCALL=y
+++++++++++ CONFIG_SYSCTL_SYSCALL_CHECK=y
            CONFIG_KALLSYMS=y
            # CONFIG_KALLSYMS_ALL is not set
            # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@@@@@@@@@@@@ -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -60,34 -69,43 +69,43 @@@@@@@@@@@@@ CONFIG_HOTPLUG=
            CONFIG_PRINTK=y
            CONFIG_BUG=y
            CONFIG_ELF_CORE=y
+++++++++++ CONFIG_COMPAT_BRK=y
            CONFIG_BASE_FULL=y
            CONFIG_FUTEX=y
+++++++++++ CONFIG_ANON_INODES=y
            CONFIG_EPOLL=y
+++++++++++ CONFIG_SIGNALFD=y
+++++++++++ CONFIG_TIMERFD=y
+++++++++++ CONFIG_EVENTFD=y
            CONFIG_SHMEM=y
----------- CONFIG_SLAB=y
            CONFIG_VM_EVENT_COUNTERS=y
+++++++++++ CONFIG_SLAB=y
+++++++++++ # CONFIG_SLUB is not set
+++++++++++ # CONFIG_SLOB is not set
+++++++++++ # CONFIG_PROFILING is not set
+++++++++++ # CONFIG_MARKERS is not set
+++++++++++ CONFIG_HAVE_OPROFILE=y
+++++++++++ # CONFIG_KPROBES is not set
+++++++++++ CONFIG_HAVE_KPROBES=y
+++++++++++ CONFIG_HAVE_KRETPROBES=y
+++++++++++ # CONFIG_HAVE_DMA_ATTRS is not set
+++++++++++ CONFIG_PROC_PAGE_MONITOR=y
+++++++++++ CONFIG_SLABINFO=y
            CONFIG_RT_MUTEXES=y
            # CONFIG_TINY_SHMEM is not set
            CONFIG_BASE_SMALL=0
----------- # CONFIG_SLOB is not set
----------- 
----------- #
----------- # Loadable module support
----------- #
            CONFIG_MODULES=y
+++++++++++ # CONFIG_MODULE_FORCE_LOAD is not set
            CONFIG_MODULE_UNLOAD=y
            # CONFIG_MODULE_FORCE_UNLOAD is not set
            # CONFIG_MODVERSIONS is not set
            # CONFIG_MODULE_SRCVERSION_ALL is not set
            CONFIG_KMOD=y
----------- 
----------- #
----------- # Block layer
----------- #
            CONFIG_BLOCK=y
            # CONFIG_LBD is not set
            # CONFIG_BLK_DEV_IO_TRACE is not set
            # CONFIG_LSF is not set
+++++++++++ # CONFIG_BLK_DEV_BSG is not set
            
            #
            # IO Schedulers
@@@@@@@@@@@@@ -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -101,6 -119,7 +119,7 @@@@@@@@@@@@@ CONFIG_DEFAULT_AS=
            # CONFIG_DEFAULT_CFQ is not set
            # CONFIG_DEFAULT_NOOP is not set
            CONFIG_DEFAULT_IOSCHED="anticipatory"
+++++++++++ CONFIG_CLASSIC_RCU=y
            
            #
            # System Type
@@@@@@@@@@@@@ -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -119,14 -138,17 +138,17 @@@@@@@@@@@@@
            # CONFIG_ARCH_NETX is not set
            # CONFIG_ARCH_H720X is not set
            # CONFIG_ARCH_IMX is not set
+++++++++++ # CONFIG_ARCH_IOP13XX is not set
            # CONFIG_ARCH_IOP32X is not set
            # CONFIG_ARCH_IOP33X is not set
----------- # CONFIG_ARCH_IOP13XX is not set
----------- # CONFIG_ARCH_IXP4XX is not set
----------- # CONFIG_ARCH_IXP2000 is not set
            # CONFIG_ARCH_IXP23XX is not set
+++++++++++ # CONFIG_ARCH_IXP2000 is not set
+++++++++++ # CONFIG_ARCH_IXP4XX is not set
            # CONFIG_ARCH_L7200 is not set
+++++++++++ # CONFIG_ARCH_KS8695 is not set
            # CONFIG_ARCH_NS9XXX is not set
+++++++++++ # CONFIG_ARCH_MXC is not set
+++++++++++ # CONFIG_ARCH_ORION5X is not set
            # CONFIG_ARCH_PNX4008 is not set
            # CONFIG_ARCH_PXA is not set
            # CONFIG_ARCH_RPC is not set
@@@@@@@@@@@@@ -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -134,18 -156,32 +156,32 @@@@@@@@@@@@@
            CONFIG_ARCH_S3C2410=y
            # CONFIG_ARCH_SHARK is not set
            # CONFIG_ARCH_LH7A40X is not set
+++++++++++ # CONFIG_ARCH_DAVINCI is not set
            # CONFIG_ARCH_OMAP is not set
+++++++++++ # CONFIG_ARCH_MSM7X00A is not set
            CONFIG_PLAT_S3C24XX=y
            CONFIG_CPU_S3C244X=y
+++++++++++ # CONFIG_S3C24XX_PWM is not set
            CONFIG_PM_SIMTEC=y
+++++++++++ CONFIG_S3C2410_DMA=y
+++++++++++ # CONFIG_S3C2410_DMA_DEBUG is not set
+++++++++++ CONFIG_MACH_SMDK=y
+++++++++++ CONFIG_PLAT_S3C=y
+++++++++++ CONFIG_CPU_LLSERIAL_S3C2410=y
+++++++++++ CONFIG_CPU_LLSERIAL_S3C2440=y
+++++++++++ 
+++++++++++ #
+++++++++++ # Boot options
+++++++++++ #
            # CONFIG_S3C_BOOT_WATCHDOG is not set
            # CONFIG_S3C_BOOT_ERROR_RESET is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Power management
+++++++++++ #
            # CONFIG_S3C2410_PM_DEBUG is not set
            # CONFIG_S3C2410_PM_CHECK is not set
            CONFIG_S3C_LOWLEVEL_UART_PORT=0
----------- CONFIG_S3C2410_DMA=y
----------- # CONFIG_S3C2410_DMA_DEBUG is not set
----------- CONFIG_MACH_SMDK=y
            
            #
            # S3C2400 Machines
@@@@@@@@@@@@@ -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -155,6 -191,8 +191,8 @@@@@@@@@@@@@ CONFIG_CPU_S3C2410_DMA=
            CONFIG_S3C2410_PM=y
            CONFIG_S3C2410_GPIO=y
            CONFIG_S3C2410_CLOCK=y
+++++++++++ CONFIG_SIMTEC_NOR=y
+++++++++++ CONFIG_MACH_BAST_IDE=y
            
            #
            # S3C2410 Machines
@@@@@@@@@@@@@ -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -167,6 -205,7 +205,7 @@@@@@@@@@@@@ CONFIG_ARCH_BAST=
            CONFIG_MACH_OTOM=y
            CONFIG_MACH_AML_M5900=y
            CONFIG_BAST_PC104_IRQ=y
+++++++++++ # CONFIG_MACH_TCT_HAMMER is not set
            CONFIG_MACH_VR1000=y
            CONFIG_MACH_QT2410=y
            CONFIG_CPU_S3C2412=y
@@@@@@@@@@@@@ -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -176,8 -215,10 +215,10 @@@@@@@@@@@@@ CONFIG_S3C2412_PM=
            #
            # S3C2412 Machines
            #
+++++++++++ # CONFIG_MACH_JIVE is not set
            CONFIG_MACH_SMDK2413=y
            CONFIG_MACH_S3C2413=y
+++++++++++ # CONFIG_MACH_SMDK2412 is not set
            CONFIG_MACH_VSTMS=y
            CONFIG_CPU_S3C2440=y
            CONFIG_S3C2440_DMA=y
@@@@@@@@@@@@@ -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -191,6 -232,7 +232,7 @@@@@@@@@@@@@ CONFIG_MACH_RX3715=
            CONFIG_ARCH_S3C2440=y
            CONFIG_MACH_NEXCODER_2440=y
            CONFIG_SMDK2440_CPU2440=y
+++++++++++ # CONFIG_MACH_AT2440EVB is not set
            CONFIG_CPU_S3C2442=y
            
            #
@@@@@@@@@@@@@ -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -215,6 -257,7 +257,7 @@@@@@@@@@@@@ CONFIG_CPU_32v4T=
            CONFIG_CPU_32v5=y
            CONFIG_CPU_ABRT_EV4T=y
            CONFIG_CPU_ABRT_EV5TJ=y
+++++++++++ CONFIG_CPU_PABRT_NOIFAR=y
            CONFIG_CPU_CACHE_V4WT=y
            CONFIG_CPU_CACHE_VIVT=y
            CONFIG_CPU_COPY_V4WB=y
@@@@@@@@@@@@@ -236,17 -236,17 -236,16 -236,17 -236,17 -236,17 -236,17 -236,17 -236,17 -236,17 -236,17 -279,16 +279,15 @@@@@@@@@@@@@ CONFIG_CPU_CP15_MMU=
            # Bus support
            #
            CONFIG_ISA=y
----------- 
----------- #
----------- # PCCARD (PCMCIA/CardBus) support
----------- #
+++++++++++ # CONFIG_PCI_SYSCALL is not set
+++++++++++ # CONFIG_ARCH_SUPPORTS_MSI is not set
            # CONFIG_PCCARD is not set
            
            #
            # Kernel Features
            #
+++++++++++ # CONFIG_TICK_ONESHOT is not set
            # CONFIG_PREEMPT is not set
-- ---------# CONFIG_NO_IDLE_HZ is not set
            CONFIG_HZ=200
            # CONFIG_AEABI is not set
            # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@@@@@@@@@@@@ -257,9 -257,9 -256,9 -257,9 -257,9 -257,9 -257,9 -257,9 -257,9 -257,9 -257,9 -299,13 +298,13 @@@@@@@@@@@@@ CONFIG_FLATMEM_MANUAL=
            CONFIG_FLATMEM=y
            CONFIG_FLAT_NODE_MEM_MAP=y
            # CONFIG_SPARSEMEM_STATIC is not set
+++++++++++ # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+++++++++++ CONFIG_PAGEFLAGS_EXTENDED=y
            CONFIG_SPLIT_PTLOCK_CPUS=4096
            # CONFIG_RESOURCES_64BIT is not set
            CONFIG_ZONE_DMA_FLAG=1
+++++++++++ CONFIG_BOUNCE=y
+++++++++++ CONFIG_VIRT_TO_BUS=y
            CONFIG_ALIGNMENT_TRAP=y
            
            #
@@@@@@@@@@@@@ -279,7 -279,7 -278,7 -279,7 -279,7 -279,7 -279,7 -279,7 -279,7 -279,7 -279,7 -325,7 +324,7 @@@@@@@@@@@@@ CONFIG_CMDLINE="root=/dev/hda1 ro init=
            # At least one emulation must be selected
            #
            CONFIG_FPE_NWFPE=y
----------- # CONFIG_FPE_NWFPE_XP is not set
+++++++++++ CONFIG_FPE_NWFPE_XP=y
            # CONFIG_FPE_FASTFPE is not set
            # CONFIG_VFP is not set
            
@@@@@@@@@@@@@ -295,10 -295,10 -294,10 -295,10 -295,10 -295,10 -295,10 -295,10 -295,10 -295,10 -295,10 -341,12 +340,12 @@@@@@@@@@@@@ CONFIG_BINFMT_AOUT=
            # Power management options
            #
            CONFIG_PM=y
----------- # CONFIG_PM_LEGACY is not set
            # CONFIG_PM_DEBUG is not set
----------- # CONFIG_PM_SYSFS_DEPRECATED is not set
----------- # CONFIG_APM_EMULATION is not set
+++++++++++ CONFIG_PM_SLEEP=y
+++++++++++ CONFIG_SUSPEND=y
+++++++++++ CONFIG_SUSPEND_FREEZER=y
+++++++++++ CONFIG_APM_EMULATION=m
+++++++++++ CONFIG_ARCH_SUSPEND_POSSIBLE=y
            
            #
            # Networking
@@@@@@@@@@@@@ -308,59 -308,59 -307,59 -308,59 -308,59 -308,59 -308,59 -308,59 -308,59 -308,59 -308,59 -356,67 +355,67 @@@@@@@@@@@@@ CONFIG_NET=
            #
            # Networking options
            #
----------- # CONFIG_NETDEBUG is not set
----------- # CONFIG_PACKET is not set
+++++++++++ CONFIG_PACKET=y
+++++++++++ # CONFIG_PACKET_MMAP is not set
            CONFIG_UNIX=y
            CONFIG_XFRM=y
            # CONFIG_XFRM_USER is not set
            # CONFIG_XFRM_SUB_POLICY is not set
            # CONFIG_XFRM_MIGRATE is not set
+++++++++++ # CONFIG_XFRM_STATISTICS is not set
            # CONFIG_NET_KEY is not set
            CONFIG_INET=y
----------- # CONFIG_IP_MULTICAST is not set
+++++++++++ CONFIG_IP_MULTICAST=y
            # CONFIG_IP_ADVANCED_ROUTER is not set
            CONFIG_IP_FIB_HASH=y
            CONFIG_IP_PNP=y
----------- # CONFIG_IP_PNP_DHCP is not set
+++++++++++ CONFIG_IP_PNP_DHCP=y
            CONFIG_IP_PNP_BOOTP=y
            # CONFIG_IP_PNP_RARP is not set
            # CONFIG_NET_IPIP is not set
            # CONFIG_NET_IPGRE is not set
+++++++++++ # CONFIG_IP_MROUTE is not set
            # CONFIG_ARPD is not set
            # CONFIG_SYN_COOKIES is not set
            # CONFIG_INET_AH is not set
            # CONFIG_INET_ESP is not set
            # CONFIG_INET_IPCOMP is not set
            # CONFIG_INET_XFRM_TUNNEL is not set
----------- # CONFIG_INET_TUNNEL is not set
+++++++++++ CONFIG_INET_TUNNEL=m
            CONFIG_INET_XFRM_MODE_TRANSPORT=y
            CONFIG_INET_XFRM_MODE_TUNNEL=y
            CONFIG_INET_XFRM_MODE_BEET=y
+++++++++++ # CONFIG_INET_LRO is not set
            CONFIG_INET_DIAG=y
            CONFIG_INET_TCP_DIAG=y
            # CONFIG_TCP_CONG_ADVANCED is not set
            CONFIG_TCP_CONG_CUBIC=y
            CONFIG_DEFAULT_TCP_CONG="cubic"
            # CONFIG_TCP_MD5SIG is not set
----------- # CONFIG_IPV6 is not set
----------- # CONFIG_INET6_XFRM_TUNNEL is not set
----------- # CONFIG_INET6_TUNNEL is not set
+++++++++++ CONFIG_IPV6=m
+++++++++++ CONFIG_IPV6_PRIVACY=y
+++++++++++ CONFIG_IPV6_ROUTER_PREF=y
+++++++++++ # CONFIG_IPV6_ROUTE_INFO is not set
+++++++++++ # CONFIG_IPV6_OPTIMISTIC_DAD is not set
+++++++++++ CONFIG_INET6_AH=m
+++++++++++ CONFIG_INET6_ESP=m
+++++++++++ CONFIG_INET6_IPCOMP=m
+++++++++++ CONFIG_IPV6_MIP6=m
+++++++++++ CONFIG_INET6_XFRM_TUNNEL=m
+++++++++++ CONFIG_INET6_TUNNEL=m
+++++++++++ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+++++++++++ CONFIG_INET6_XFRM_MODE_TUNNEL=m
+++++++++++ CONFIG_INET6_XFRM_MODE_BEET=m
+++++++++++ CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+++++++++++ CONFIG_IPV6_SIT=m
+++++++++++ CONFIG_IPV6_NDISC_NODETYPE=y
+++++++++++ CONFIG_IPV6_TUNNEL=m
+++++++++++ # CONFIG_IPV6_MULTIPLE_TABLES is not set
+++++++++++ # CONFIG_IPV6_MROUTE is not set
            # CONFIG_NETWORK_SECMARK is not set
            # CONFIG_NETFILTER is not set
----------- 
----------- #
----------- # DCCP Configuration (EXPERIMENTAL)
----------- #
            # CONFIG_IP_DCCP is not set
----------- 
----------- #
----------- # SCTP Configuration (EXPERIMENTAL)
----------- #
            # CONFIG_IP_SCTP is not set
----------- 
----------- #
----------- # TIPC Configuration (EXPERIMENTAL)
----------- #
            # CONFIG_TIPC is not set
            # CONFIG_ATM is not set
            # CONFIG_BRIDGE is not set
@@@@@@@@@@@@@ -373,20 -373,20 -372,20 -373,20 -373,20 -373,20 -373,20 -373,20 -373,20 -373,20 -373,20 -429,71 +428,71 @@@@@@@@@@@@@
            # CONFIG_LAPB is not set
            # CONFIG_ECONET is not set
            # CONFIG_WAN_ROUTER is not set
----------- 
----------- #
----------- # QoS and/or fair queueing
----------- #
            # CONFIG_NET_SCHED is not set
+++++++++++ CONFIG_NET_SCH_FIFO=y
            
            #
            # Network testing
            #
            # CONFIG_NET_PKTGEN is not set
            # CONFIG_HAMRADIO is not set
+++++++++++ # CONFIG_CAN is not set
            # CONFIG_IRDA is not set
----------- # CONFIG_BT is not set
+++++++++++ CONFIG_BT=m
+++++++++++ CONFIG_BT_L2CAP=m
+++++++++++ CONFIG_BT_SCO=m
+++++++++++ CONFIG_BT_RFCOMM=m
+++++++++++ CONFIG_BT_RFCOMM_TTY=y
+++++++++++ CONFIG_BT_BNEP=m
+++++++++++ CONFIG_BT_BNEP_MC_FILTER=y
+++++++++++ CONFIG_BT_BNEP_PROTO_FILTER=y
+++++++++++ CONFIG_BT_HIDP=m
+++++++++++ 
+++++++++++ #
+++++++++++ # Bluetooth device drivers
+++++++++++ #
+++++++++++ CONFIG_BT_HCIUSB=m
+++++++++++ CONFIG_BT_HCIUSB_SCO=y
+++++++++++ CONFIG_BT_HCIUART=m
+++++++++++ CONFIG_BT_HCIUART_H4=y
+++++++++++ CONFIG_BT_HCIUART_BCSP=y
+++++++++++ CONFIG_BT_HCIUART_LL=y
+++++++++++ CONFIG_BT_HCIBCM203X=m
+++++++++++ CONFIG_BT_HCIBPA10X=m
+++++++++++ CONFIG_BT_HCIBFUSB=m
+++++++++++ CONFIG_BT_HCIVHCI=m
+++++++++++ # CONFIG_AF_RXRPC is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Wireless
+++++++++++ #
+++++++++++ CONFIG_CFG80211=m
+++++++++++ CONFIG_NL80211=y
+++++++++++ CONFIG_WIRELESS_EXT=y
+++++++++++ CONFIG_MAC80211=m
+++++++++++ 
+++++++++++ #
+++++++++++ # Rate control algorithm selection
+++++++++++ #
+++++++++++ CONFIG_MAC80211_RC_DEFAULT_PID=y
+++++++++++ # CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Selecting 'y' for an algorithm will
+++++++++++ #
+++++++++++ 
+++++++++++ #
+++++++++++ # build the algorithm into mac80211.
+++++++++++ #
+++++++++++ CONFIG_MAC80211_RC_DEFAULT="pid"
+++++++++++ CONFIG_MAC80211_RC_PID=y
+++++++++++ CONFIG_MAC80211_MESH=y
+++++++++++ CONFIG_MAC80211_LEDS=y
+++++++++++ # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+++++++++++ # CONFIG_MAC80211_DEBUG is not set
            # CONFIG_IEEE80211 is not set
+++++++++++ # CONFIG_RFKILL is not set
+++++++++++ # CONFIG_NET_9P is not set
            
            #
            # Device Drivers
@@@@@@@@@@@@@ -395,21 -395,21 -394,21 -395,21 -395,21 -395,21 -395,21 -395,21 -395,21 -395,21 -395,21 -502,14 +501,14 @@@@@@@@@@@@@
            #
            # Generic Driver Options
            #
+++++++++++ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
            CONFIG_STANDALONE=y
            CONFIG_PREVENT_FIRMWARE_BUILD=y
----------- # CONFIG_FW_LOADER is not set
+++++++++++ CONFIG_FW_LOADER=m
            # CONFIG_DEBUG_DRIVER is not set
            # CONFIG_DEBUG_DEVRES is not set
            # CONFIG_SYS_HYPERVISOR is not set
----------- 
----------- #
----------- # Connector - unified userspace <-> kernelspace linker
----------- #
            # CONFIG_CONNECTOR is not set
----------- 
----------- #
----------- # Memory Technology Devices (MTD)
----------- #
            CONFIG_MTD=y
            # CONFIG_MTD_DEBUG is not set
            # CONFIG_MTD_CONCAT is not set
@@@@@@@@@@@@@ -420,6 -420,6 -419,6 -420,6 -420,6 -420,6 -420,6 -420,6 -420,6 -420,6 -420,6 -520,7 +519,7 @@@@@@@@@@@@@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=
            # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
            CONFIG_MTD_CMDLINE_PARTS=y
            # CONFIG_MTD_AFS_PARTS is not set
+++++++++++ # CONFIG_MTD_AR7_PARTS is not set
            
            #
            # User Modules And Translation Layers
@@@@@@@@@@@@@ -432,6 -432,6 -431,6 -432,6 -432,6 -432,6 -432,6 -432,6 -432,6 -432,6 -432,6 -533,7 +532,7 @@@@@@@@@@@@@ CONFIG_MTD_BLOCK=
            # CONFIG_INFTL is not set
            # CONFIG_RFD_FTL is not set
            # CONFIG_SSFDC is not set
+++++++++++ # CONFIG_MTD_OOPS is not set
            
            #
            # RAM/ROM/Flash chip drivers
@@@@@@@@@@@@@ -457,7 -457,7 -456,7 -457,7 -457,7 -457,7 -457,7 -457,7 -457,7 -457,7 -457,7 -559,6 +558,6 @@@@@@@@@@@@@ CONFIG_MTD_CFI_UTIL=
            # CONFIG_MTD_RAM is not set
            CONFIG_MTD_ROM=y
            # CONFIG_MTD_ABSENT is not set
----------- # CONFIG_MTD_OBSOLETE_CHIPS is not set
            
            #
            # Mapping drivers for chip access
@@@@@@@@@@@@@ -486,13 -486,13 -485,13 -486,13 -486,13 -486,13 -486,13 -486,13 -486,13 -486,13 -486,13 -587,10 +586,10 @@@@@@@@@@@@@ CONFIG_MTD_BAST_MAXSIZE=
            # CONFIG_MTD_DOC2000 is not set
            # CONFIG_MTD_DOC2001 is not set
            # CONFIG_MTD_DOC2001PLUS is not set
----------- 
----------- #
----------- # NAND Flash Device Drivers
----------- #
            CONFIG_MTD_NAND=y
            # CONFIG_MTD_NAND_VERIFY_WRITE is not set
            # CONFIG_MTD_NAND_ECC_SMC is not set
+++++++++++ # CONFIG_MTD_NAND_MUSEUM_IDS is not set
            CONFIG_MTD_NAND_IDS=y
            CONFIG_MTD_NAND_S3C2410=y
            # CONFIG_MTD_NAND_S3C2410_DEBUG is not set
@@@@@@@@@@@@@ -500,30 -500,30 -499,30 -500,30 -500,30 -500,30 -500,30 -500,30 -500,30 -500,30 -500,30 -598,25 +597,25 @@@@@@@@@@@@@
            # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
            # CONFIG_MTD_NAND_DISKONCHIP is not set
            # CONFIG_MTD_NAND_NANDSIM is not set
----------- 
----------- #
----------- # OneNAND Flash Device Drivers
----------- #
+++++++++++ # CONFIG_MTD_NAND_PLATFORM is not set
+++++++++++ # CONFIG_MTD_ALAUDA is not set
            # CONFIG_MTD_ONENAND is not set
            
            #
----------- # Parallel port support
+++++++++++ # UBI - Unsorted block images
            #
+++++++++++ # CONFIG_MTD_UBI is not set
            CONFIG_PARPORT=y
----------- # CONFIG_PARPORT_PC is not set
+++++++++++ CONFIG_PARPORT_PC=m
+++++++++++ # CONFIG_PARPORT_PC_FIFO is not set
+++++++++++ # CONFIG_PARPORT_PC_SUPERIO is not set
            # CONFIG_PARPORT_GSC is not set
----------- # CONFIG_PARPORT_AX88796 is not set
+++++++++++ CONFIG_PARPORT_AX88796=m
            CONFIG_PARPORT_1284=y
----------- 
----------- #
----------- # Plug and Play support
----------- #
+++++++++++ CONFIG_PARPORT_NOT_PC=y
            # CONFIG_PNP is not set
----------- # CONFIG_PNPACPI is not set
----------- 
----------- #
----------- # Block devices
----------- #
+++++++++++ CONFIG_BLK_DEV=y
+++++++++++ # CONFIG_PARIDE is not set
            # CONFIG_BLK_DEV_COW_COMMON is not set
            CONFIG_BLK_DEV_LOOP=y
            # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@@@@@@@@@@@@ -532,34 -532,34 -531,34 -532,34 -532,34 -532,34 -532,34 -532,34 -532,34 -532,34 -532,34 -625,34 +624,34 @@@@@@@@@@@@@ CONFIG_BLK_DEV_NBD=
            CONFIG_BLK_DEV_RAM=y
            CONFIG_BLK_DEV_RAM_COUNT=16
            CONFIG_BLK_DEV_RAM_SIZE=4096
----------- CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+++++++++++ # CONFIG_BLK_DEV_XIP is not set
            # CONFIG_CDROM_PKTCDVD is not set
            CONFIG_ATA_OVER_ETH=m
----------- 
----------- #
----------- # ATA/ATAPI/MFM/RLL support
----------- #
+++++++++++ CONFIG_MISC_DEVICES=y
+++++++++++ # CONFIG_EEPROM_93CX6 is not set
+++++++++++ # CONFIG_ENCLOSURE_SERVICES is not set
+++++++++++ CONFIG_HAVE_IDE=y
            CONFIG_IDE=y
            CONFIG_BLK_DEV_IDE=y
            
            #
----------- # Please see Documentation/ide.txt for help/info on IDE drives
+++++++++++ # Please see Documentation/ide/ide.txt for help/info on IDE drives
            #
            # CONFIG_BLK_DEV_IDE_SATA is not set
            CONFIG_BLK_DEV_IDEDISK=y
            # CONFIG_IDEDISK_MULTI_MODE is not set
            CONFIG_BLK_DEV_IDECD=y
+++++++++++ CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
            CONFIG_BLK_DEV_IDETAPE=m
            CONFIG_BLK_DEV_IDEFLOPPY=m
+++++++++++ # CONFIG_BLK_DEV_IDESCSI is not set
            # CONFIG_IDE_TASK_IOCTL is not set
+++++++++++ CONFIG_IDE_PROC_FS=y
            
            #
            # IDE chipset support/bugfixes
            #
----------- CONFIG_IDE_GENERIC=y
----------- # CONFIG_IDE_ARM is not set
----------- CONFIG_BLK_DEV_IDE_BAST=y
----------- # CONFIG_IDE_CHIPSETS is not set
+++++++++++ # CONFIG_BLK_DEV_PLATFORM is not set
            # CONFIG_BLK_DEV_IDEDMA is not set
            # CONFIG_BLK_DEV_HD is not set
            
@@@@@@@@@@@@@ -567,101 -567,101 -566,101 -567,101 -567,101 -567,101 -567,101 -567,101 -567,101 -567,101 -567,101 -660,119 +659,119 @@@@@@@@@@@@@
            # SCSI device support
            #
            # CONFIG_RAID_ATTRS is not set
----------- # CONFIG_SCSI is not set
+++++++++++ CONFIG_SCSI=y
+++++++++++ CONFIG_SCSI_DMA=y
+++++++++++ CONFIG_SCSI_TGT=m
            # CONFIG_SCSI_NETLINK is not set
----------- 
----------- #
----------- # Serial ATA (prod) and Parallel ATA (experimental) drivers
----------- #
+++++++++++ CONFIG_SCSI_PROC_FS=y
+++++++++++ 
+++++++++++ #
+++++++++++ # SCSI support type (disk, tape, CD-ROM)
+++++++++++ #
+++++++++++ CONFIG_BLK_DEV_SD=y
+++++++++++ CONFIG_CHR_DEV_ST=m
+++++++++++ # CONFIG_CHR_DEV_OSST is not set
+++++++++++ CONFIG_BLK_DEV_SR=m
+++++++++++ CONFIG_BLK_DEV_SR_VENDOR=y
+++++++++++ CONFIG_CHR_DEV_SG=y
+++++++++++ CONFIG_CHR_DEV_SCH=m
+++++++++++ 
+++++++++++ #
+++++++++++ # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+++++++++++ #
+++++++++++ CONFIG_SCSI_MULTI_LUN=y
+++++++++++ CONFIG_SCSI_CONSTANTS=y
+++++++++++ # CONFIG_SCSI_LOGGING is not set
+++++++++++ CONFIG_SCSI_SCAN_ASYNC=y
+++++++++++ CONFIG_SCSI_WAIT_SCAN=m
+++++++++++ 
+++++++++++ #
+++++++++++ # SCSI Transports
+++++++++++ #
+++++++++++ # CONFIG_SCSI_SPI_ATTRS is not set
+++++++++++ # CONFIG_SCSI_FC_ATTRS is not set
+++++++++++ # CONFIG_SCSI_ISCSI_ATTRS is not set
+++++++++++ # CONFIG_SCSI_SAS_LIBSAS is not set
+++++++++++ # CONFIG_SCSI_SRP_ATTRS is not set
+++++++++++ CONFIG_SCSI_LOWLEVEL=y
+++++++++++ # CONFIG_ISCSI_TCP is not set
+++++++++++ # CONFIG_SCSI_AHA152X is not set
+++++++++++ # CONFIG_SCSI_AIC7XXX_OLD is not set
+++++++++++ # CONFIG_SCSI_ADVANSYS is not set
+++++++++++ # CONFIG_SCSI_IN2000 is not set
+++++++++++ # CONFIG_SCSI_DTC3280 is not set
+++++++++++ # CONFIG_SCSI_FUTURE_DOMAIN is not set
+++++++++++ # CONFIG_SCSI_GENERIC_NCR5380 is not set
+++++++++++ # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+++++++++++ # CONFIG_SCSI_PPA is not set
+++++++++++ # CONFIG_SCSI_IMM is not set
+++++++++++ # CONFIG_SCSI_NCR53C406A is not set
+++++++++++ # CONFIG_SCSI_PAS16 is not set
+++++++++++ # CONFIG_SCSI_QLOGIC_FAS is not set
+++++++++++ # CONFIG_SCSI_SYM53C416 is not set
+++++++++++ # CONFIG_SCSI_T128 is not set
+++++++++++ # CONFIG_SCSI_DEBUG is not set
            # CONFIG_ATA is not set
----------- 
----------- #
----------- # Multi-device support (RAID and LVM)
----------- #
+++++++++++ CONFIG_HAVE_PATA_PLATFORM=y
            # CONFIG_MD is not set
----------- 
----------- #
----------- # Fusion MPT device support
----------- #
----------- # CONFIG_FUSION is not set
----------- 
----------- #
----------- # IEEE 1394 (FireWire) support
----------- #
----------- 
----------- #
----------- # I2O device support
----------- #
----------- 
----------- #
----------- # Network device support
----------- #
            CONFIG_NETDEVICES=y
+++++++++++ # CONFIG_NETDEVICES_MULTIQUEUE is not set
            # CONFIG_DUMMY is not set
            # CONFIG_BONDING is not set
+++++++++++ # CONFIG_MACVLAN is not set
            # CONFIG_EQUALIZER is not set
            # CONFIG_TUN is not set
----------- 
----------- #
----------- # ARCnet devices
----------- #
+++++++++++ # CONFIG_VETH is not set
            # CONFIG_ARCNET is not set
----------- 
----------- #
----------- # PHY device support
----------- #
            # CONFIG_PHYLIB is not set
----------- 
----------- #
----------- # Ethernet (10 or 100Mbit)
----------- #
            CONFIG_NET_ETHERNET=y
            CONFIG_MII=y
+++++++++++ # CONFIG_AX88796 is not set
            # CONFIG_NET_VENDOR_3COM is not set
            # CONFIG_NET_VENDOR_SMC is not set
            # CONFIG_SMC91X is not set
            CONFIG_DM9000=y
+++++++++++ # CONFIG_ENC28J60 is not set
+++++++++++ CONFIG_DM9000_DEBUGLEVEL=4
            # CONFIG_NET_VENDOR_RACAL is not set
            # CONFIG_AT1700 is not set
            # CONFIG_DEPCA is not set
            # CONFIG_HP100 is not set
            # CONFIG_NET_ISA is not set
+++++++++++ # CONFIG_IBM_NEW_EMAC_ZMII is not set
+++++++++++ # CONFIG_IBM_NEW_EMAC_RGMII is not set
+++++++++++ # CONFIG_IBM_NEW_EMAC_TAH is not set
+++++++++++ # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
            # CONFIG_NET_PCI is not set
+++++++++++ # CONFIG_B44 is not set
            # CONFIG_NET_POCKET is not set
----------- 
----------- #
----------- # Ethernet (1000 Mbit)
----------- #
----------- 
----------- #
----------- # Ethernet (10000 Mbit)
----------- #
----------- 
----------- #
----------- # Token Ring devices
----------- #
+++++++++++ CONFIG_NETDEV_1000=y
+++++++++++ # CONFIG_E1000E_ENABLED is not set
+++++++++++ CONFIG_NETDEV_10000=y
            # CONFIG_TR is not set
            
            #
----------- # Wireless LAN (non-hamradio)
+++++++++++ # Wireless LAN
            #
----------- # CONFIG_NET_RADIO is not set
+++++++++++ # CONFIG_WLAN_PRE80211 is not set
+++++++++++ # CONFIG_WLAN_80211 is not set
+++++++++++ # CONFIG_IWLWIFI_LEDS is not set
            
            #
----------- # Wan interfaces
+++++++++++ # USB Network Adapters
            #
+++++++++++ # CONFIG_USB_CATC is not set
+++++++++++ # CONFIG_USB_KAWETH is not set
+++++++++++ # CONFIG_USB_PEGASUS is not set
+++++++++++ # CONFIG_USB_RTL8150 is not set
+++++++++++ # CONFIG_USB_USBNET is not set
            # CONFIG_WAN is not set
            # CONFIG_PLIP is not set
            # CONFIG_PPP is not set
            # CONFIG_SLIP is not set
----------- # CONFIG_SHAPER is not set
            # CONFIG_NETCONSOLE is not set
            # CONFIG_NETPOLL is not set
            # CONFIG_NET_POLL_CONTROLLER is not set
----------- 
----------- #
----------- # ISDN subsystem
----------- #
            # CONFIG_ISDN is not set
            
            #
@@@@@@@@@@@@@ -669,6 -669,6 -668,6 -669,6 -669,6 -669,6 -669,6 -669,6 -669,6 -669,6 -669,6 -780,7 +779,7 @@@@@@@@@@@@@
            #
            CONFIG_INPUT=y
            # CONFIG_INPUT_FF_MEMLESS is not set
+++++++++++ # CONFIG_INPUT_POLLDEV is not set
            
            #
            # Userland interfaces
@@@@@@@@@@@@@ -678,7 -678,7 -677,7 -678,7 -678,7 -678,7 -678,7 -678,7 -678,7 -678,7 -678,7 -790,6 +789,6 @@@@@@@@@@@@@ CONFIG_INPUT_MOUSEDEV_PSAUX=
            CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
            CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
            # CONFIG_INPUT_JOYDEV is not set
----------- # CONFIG_INPUT_TSDEV is not set
            # CONFIG_INPUT_EVDEV is not set
            # CONFIG_INPUT_EVBUG is not set
            
@@@@@@@@@@@@@ -695,12 -695,12 -694,12 -695,12 -695,12 -695,12 -695,12 -695,12 -695,12 -695,12 -695,12 -806,21 +805,21 @@@@@@@@@@@@@ CONFIG_KEYBOARD_ATKBD=
            # CONFIG_KEYBOARD_GPIO is not set
            CONFIG_INPUT_MOUSE=y
            CONFIG_MOUSE_PS2=y
+++++++++++ CONFIG_MOUSE_PS2_ALPS=y
+++++++++++ CONFIG_MOUSE_PS2_LOGIPS2PP=y
+++++++++++ CONFIG_MOUSE_PS2_SYNAPTICS=y
+++++++++++ CONFIG_MOUSE_PS2_LIFEBOOK=y
+++++++++++ CONFIG_MOUSE_PS2_TRACKPOINT=y
+++++++++++ # CONFIG_MOUSE_PS2_TOUCHKIT is not set
            # CONFIG_MOUSE_SERIAL is not set
+++++++++++ # CONFIG_MOUSE_APPLETOUCH is not set
            # CONFIG_MOUSE_INPORT is not set
            # CONFIG_MOUSE_LOGIBM is not set
            # CONFIG_MOUSE_PC110PAD is not set
            # CONFIG_MOUSE_VSXXXAA is not set
+++++++++++ # CONFIG_MOUSE_GPIO is not set
            # CONFIG_INPUT_JOYSTICK is not set
+++++++++++ # CONFIG_INPUT_TABLET is not set
            # CONFIG_INPUT_TOUCHSCREEN is not set
            # CONFIG_INPUT_MISC is not set
            
@@@@@@@@@@@@@ -721,6 -721,6 -720,6 -721,6 -721,6 -721,6 -721,6 -721,6 -721,6 -721,6 -721,6 -841,7 +840,7 @@@@@@@@@@@@@ CONFIG_VT=
            CONFIG_VT_CONSOLE=y
            CONFIG_HW_CONSOLE=y
            # CONFIG_VT_HW_CONSOLE_BINDING is not set
+++++++++++ CONFIG_DEVKMEM=y
            CONFIG_SERIAL_NONSTANDARD=y
            # CONFIG_COMPUTONE is not set
            # CONFIG_ROCKETPORT is not set
@@@@@@@@@@@@@ -728,8 -728,8 -727,8 -728,8 -728,8 -728,8 -728,8 -728,8 -728,8 -728,8 -728,8 -849,6 +848,6 @@@@@@@@@@@@@
            # CONFIG_DIGIEPCA is not set
            # CONFIG_MOXA_INTELLIO is not set
            # CONFIG_MOXA_SMARTIO is not set
----------- # CONFIG_MOXA_SMARTIO_NEW is not set
----------- # CONFIG_SYNCLINKMP is not set
            # CONFIG_N_HDLC is not set
            # CONFIG_RISCOM8 is not set
            # CONFIG_SPECIALIX is not set
@@@@@@@@@@@@@ -758,8 -758,8 -757,8 -758,8 -758,8 -758,8 -758,8 -758,8 -758,8 -758,8 -758,8 -877,12 +876,12 @@@@@@@@@@@@@ CONFIG_SERIAL_8250_SHARE_IRQ=
            #
            # Non-8250 serial port support
            #
+++++++++++ CONFIG_SERIAL_SAMSUNG=y
+++++++++++ # CONFIG_SERIAL_SAMSUNG_DEBUG is not set
+++++++++++ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
            CONFIG_SERIAL_S3C2410=y
----------- CONFIG_SERIAL_S3C2410_CONSOLE=y
+++++++++++ CONFIG_SERIAL_S3C2412=y
+++++++++++ CONFIG_SERIAL_S3C2440=y
            CONFIG_SERIAL_CORE=y
            CONFIG_SERIAL_CORE_CONSOLE=y
            CONFIG_UNIX98_PTYS=y
@@@@@@@@@@@@@ -768,89 -768,89 -767,89 -768,89 -768,89 -768,89 -768,89 -768,89 -768,89 -768,89 -768,89 -891,50 +890,50 @@@@@@@@@@@@@ CONFIG_LEGACY_PTY_COUNT=25
            CONFIG_PRINTER=y
            # CONFIG_LP_CONSOLE is not set
            CONFIG_PPDEV=y
----------- # CONFIG_TIPAR is not set
----------- 
----------- #
----------- # IPMI
----------- #
            # CONFIG_IPMI_HANDLER is not set
----------- 
----------- #
----------- # Watchdog Cards
----------- #
----------- CONFIG_WATCHDOG=y
----------- # CONFIG_WATCHDOG_NOWAYOUT is not set
----------- 
----------- #
----------- # Watchdog Device Drivers
----------- #
----------- # CONFIG_SOFT_WATCHDOG is not set
----------- CONFIG_S3C2410_WATCHDOG=y
----------- 
----------- #
----------- # ISA-based Watchdog Cards
----------- #
----------- # CONFIG_PCWATCHDOG is not set
----------- # CONFIG_MIXCOMWD is not set
----------- # CONFIG_WDT is not set
----------- 
----------- #
----------- # USB-based Watchdog Cards
----------- #
----------- # CONFIG_USBPCWATCHDOG is not set
            CONFIG_HW_RANDOM=y
            # CONFIG_NVRAM is not set
            # CONFIG_DTLK is not set
            # CONFIG_R3964 is not set
            # CONFIG_RAW_DRIVER is not set
----------- 
----------- #
----------- # TPM devices
----------- #
            # CONFIG_TCG_TPM is not set
----------- 
----------- #
----------- # I2C support
----------- #
+++++++++++ CONFIG_DEVPORT=y
            CONFIG_I2C=y
+++++++++++ CONFIG_I2C_BOARDINFO=y
            CONFIG_I2C_CHARDEV=m
----------- 
----------- #
----------- # I2C Algorithms
----------- #
----------- CONFIG_I2C_ALGOBIT=m
----------- # CONFIG_I2C_ALGOPCF is not set
----------- # CONFIG_I2C_ALGOPCA is not set
+++++++++++ CONFIG_I2C_ALGOBIT=y
            
            #
            # I2C Hardware Bus support
            #
            # CONFIG_I2C_ELEKTOR is not set
+++++++++++ # CONFIG_I2C_GPIO is not set
            # CONFIG_I2C_OCORES is not set
            # CONFIG_I2C_PARPORT is not set
            # CONFIG_I2C_PARPORT_LIGHT is not set
            CONFIG_I2C_S3C2410=y
+++++++++++ CONFIG_I2C_SIMTEC=y
+++++++++++ # CONFIG_I2C_TAOS_EVM is not set
            # CONFIG_I2C_STUB is not set
+++++++++++ # CONFIG_I2C_TINY_USB is not set
            # CONFIG_I2C_PCA_ISA is not set
+++++++++++ # CONFIG_I2C_PCA_PLATFORM is not set
            
            #
            # Miscellaneous I2C Chip support
            #
----------- # CONFIG_SENSORS_DS1337 is not set
----------- # CONFIG_SENSORS_DS1374 is not set
+++++++++++ # CONFIG_DS1682 is not set
            CONFIG_SENSORS_EEPROM=m
            # CONFIG_SENSORS_PCF8574 is not set
----------- # CONFIG_SENSORS_PCA9539 is not set
+++++++++++ # CONFIG_PCF8575 is not set
            # CONFIG_SENSORS_PCF8591 is not set
+++++++++++ # CONFIG_TPS65010 is not set
            # CONFIG_SENSORS_MAX6875 is not set
+++++++++++ # CONFIG_SENSORS_TSL2550 is not set
            # CONFIG_I2C_DEBUG_CORE is not set
            # CONFIG_I2C_DEBUG_ALGO is not set
            # CONFIG_I2C_DEBUG_BUS is not set
            # CONFIG_I2C_DEBUG_CHIP is not set
----------- 
----------- #
----------- # SPI support
----------- #
            CONFIG_SPI=y
            # CONFIG_SPI_DEBUG is not set
            CONFIG_SPI_MASTER=y
@@@@@@@@@@@@@ -860,6 -860,6 -859,6 -860,6 -860,6 -860,6 -860,6 -860,6 -860,6 -860,6 -860,6 -944,7 +943,7 @@@@@@@@@@@@@
            #
            CONFIG_SPI_BITBANG=m
            # CONFIG_SPI_BUTTERFLY is not set
+++++++++++ # CONFIG_SPI_LM70_LLP is not set
            CONFIG_SPI_S3C24XX=m
            CONFIG_SPI_S3C24XX_GPIO=m
            
@@@@@@@@@@@@@ -867,30 -867,30 -866,30 -867,30 -867,30 -867,30 -867,30 -867,30 -867,30 -867,30 -867,30 -952,43 +951,43 @@@@@@@@@@@@@
            # SPI Protocol Masters
            #
            # CONFIG_SPI_AT25 is not set
+++++++++++ # CONFIG_SPI_SPIDEV is not set
+++++++++++ # CONFIG_SPI_TLE62X0 is not set
+++++++++++ CONFIG_HAVE_GPIO_LIB=y
            
            #
----------- # Dallas's 1-wire bus
+++++++++++ # GPIO Support
            #
----------- # CONFIG_W1 is not set
+++++++++++ # CONFIG_DEBUG_GPIO is not set
            
            #
----------- # Hardware Monitoring support
+++++++++++ # I2C GPIO expanders:
+++++++++++ #
+++++++++++ # CONFIG_GPIO_PCA953X is not set
+++++++++++ # CONFIG_GPIO_PCF857X is not set
+++++++++++ 
            #
+++++++++++ # SPI GPIO expanders:
+++++++++++ #
+++++++++++ # CONFIG_GPIO_MCP23S08 is not set
+++++++++++ # CONFIG_W1 is not set
+++++++++++ # CONFIG_POWER_SUPPLY is not set
            CONFIG_HWMON=y
            CONFIG_HWMON_VID=m
----------- # CONFIG_SENSORS_ABITUGURU is not set
+++++++++++ # CONFIG_SENSORS_AD7418 is not set
            # CONFIG_SENSORS_ADM1021 is not set
            # CONFIG_SENSORS_ADM1025 is not set
            # CONFIG_SENSORS_ADM1026 is not set
            # CONFIG_SENSORS_ADM1029 is not set
            # CONFIG_SENSORS_ADM1031 is not set
            # CONFIG_SENSORS_ADM9240 is not set
----------- # CONFIG_SENSORS_ASB100 is not set
+++++++++++ # CONFIG_SENSORS_ADT7470 is not set
+++++++++++ # CONFIG_SENSORS_ADT7473 is not set
            # CONFIG_SENSORS_ATXP1 is not set
            # CONFIG_SENSORS_DS1621 is not set
            # CONFIG_SENSORS_F71805F is not set
----------- # CONFIG_SENSORS_FSCHER is not set
----------- # CONFIG_SENSORS_FSCPOS is not set
+++++++++++ # CONFIG_SENSORS_F71882FG is not set
+++++++++++ # CONFIG_SENSORS_F75375S is not set
            # CONFIG_SENSORS_GL518SM is not set
            # CONFIG_SENSORS_GL520SM is not set
            # CONFIG_SENSORS_IT87 is not set
@@@@@@@@@@@@@ -905,72 -905,72 -904,72 -905,72 -905,72 -905,72 -905,72 -905,72 -905,72 -905,72 -905,72 -1003,95 +1002,95 @@@@@@@@@@@@@ CONFIG_SENSORS_LM85=
            # CONFIG_SENSORS_LM87 is not set
            # CONFIG_SENSORS_LM90 is not set
            # CONFIG_SENSORS_LM92 is not set
+++++++++++ # CONFIG_SENSORS_LM93 is not set
            # CONFIG_SENSORS_MAX1619 is not set
+++++++++++ # CONFIG_SENSORS_MAX6650 is not set
            # CONFIG_SENSORS_PC87360 is not set
            # CONFIG_SENSORS_PC87427 is not set
+++++++++++ # CONFIG_SENSORS_DME1737 is not set
            # CONFIG_SENSORS_SMSC47M1 is not set
            # CONFIG_SENSORS_SMSC47M192 is not set
            # CONFIG_SENSORS_SMSC47B397 is not set
+++++++++++ # CONFIG_SENSORS_ADS7828 is not set
+++++++++++ # CONFIG_SENSORS_THMC50 is not set
            # CONFIG_SENSORS_VT1211 is not set
            # CONFIG_SENSORS_W83781D is not set
            # CONFIG_SENSORS_W83791D is not set
            # CONFIG_SENSORS_W83792D is not set
            # CONFIG_SENSORS_W83793 is not set
            # CONFIG_SENSORS_W83L785TS is not set
+++++++++++ # CONFIG_SENSORS_W83L786NG is not set
            # CONFIG_SENSORS_W83627HF is not set
            # CONFIG_SENSORS_W83627EHF is not set
            # CONFIG_HWMON_DEBUG_CHIP is not set
+++++++++++ CONFIG_WATCHDOG=y
+++++++++++ # CONFIG_WATCHDOG_NOWAYOUT is not set
            
            #
----------- # Misc devices
+++++++++++ # Watchdog Device Drivers
            #
+++++++++++ # CONFIG_SOFT_WATCHDOG is not set
+++++++++++ CONFIG_S3C2410_WATCHDOG=y
            
            #
----------- # Multifunction device drivers
+++++++++++ # ISA-based Watchdog Cards
            #
----------- # CONFIG_MFD_SM501 is not set
+++++++++++ # CONFIG_PCWATCHDOG is not set
+++++++++++ # CONFIG_MIXCOMWD is not set
+++++++++++ # CONFIG_WDT is not set
            
            #
----------- # LED devices
+++++++++++ # USB-based Watchdog Cards
            #
----------- CONFIG_NEW_LEDS=y
----------- CONFIG_LEDS_CLASS=m
+++++++++++ # CONFIG_USBPCWATCHDOG is not set
            
            #
----------- # LED drivers
+++++++++++ # Sonics Silicon Backplane
            #
----------- CONFIG_LEDS_S3C24XX=m
----------- CONFIG_LEDS_H1940=m
+++++++++++ CONFIG_SSB_POSSIBLE=y
+++++++++++ # CONFIG_SSB is not set
            
            #
----------- # LED Triggers
+++++++++++ # Multifunction device drivers
            #
----------- CONFIG_LEDS_TRIGGERS=y
----------- CONFIG_LEDS_TRIGGER_TIMER=m
----------- # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
----------- CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+++++++++++ CONFIG_MFD_SM501=y
+++++++++++ # CONFIG_MFD_ASIC3 is not set
+++++++++++ # CONFIG_HTC_EGPIO is not set
+++++++++++ # CONFIG_HTC_PASIC3 is not set
            
            #
            # Multimedia devices
            #
+++++++++++ 
+++++++++++ #
+++++++++++ # Multimedia core support
+++++++++++ #
            # CONFIG_VIDEO_DEV is not set
+++++++++++ # CONFIG_DVB_CORE is not set
+++++++++++ # CONFIG_VIDEO_MEDIA is not set
            
            #
----------- # Digital Video Broadcasting Devices
+++++++++++ # Multimedia drivers
            #
----------- # CONFIG_DVB is not set
----------- # CONFIG_USB_DABUSB is not set
+++++++++++ # CONFIG_DAB is not set
            
            #
            # Graphics support
            #
----------- # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+++++++++++ # CONFIG_VGASTATE is not set
+++++++++++ # CONFIG_VIDEO_OUTPUT_CONTROL is not set
            CONFIG_FB=y
            CONFIG_FIRMWARE_EDID=y
            # CONFIG_FB_DDC is not set
            CONFIG_FB_CFB_FILLRECT=y
            CONFIG_FB_CFB_COPYAREA=y
            CONFIG_FB_CFB_IMAGEBLIT=y
+++++++++++ # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+++++++++++ # CONFIG_FB_SYS_FILLRECT is not set
+++++++++++ # CONFIG_FB_SYS_COPYAREA is not set
+++++++++++ # CONFIG_FB_SYS_IMAGEBLIT is not set
+++++++++++ # CONFIG_FB_FOREIGN_ENDIAN is not set
+++++++++++ # CONFIG_FB_SYS_FOPS is not set
            # CONFIG_FB_SVGALIB is not set
            # CONFIG_FB_MACMODES is not set
            # CONFIG_FB_BACKLIGHT is not set
@@@@@@@@@@@@@ -978,12 -978,12 -977,12 -978,12 -978,12 -978,12 -978,12 -978,12 -978,12 -978,12 -978,12 -1099,19 +1098,19 @@@@@@@@@@@@@ CONFIG_FB_MODE_HELPERS=
            # CONFIG_FB_TILEBLITTING is not set
            
            #
----------- # Frambuffer hardware drivers
+++++++++++ # Frame buffer hardware drivers
            #
            # CONFIG_FB_S1D13XXX is not set
            CONFIG_FB_S3C2410=y
            # CONFIG_FB_S3C2410_DEBUG is not set
+++++++++++ CONFIG_FB_SM501=y
            # CONFIG_FB_VIRTUAL is not set
+++++++++++ # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Display device support
+++++++++++ #
+++++++++++ # CONFIG_DISPLAY_SUPPORT is not set
            
            #
            # Console display driver support
@@@@@@@@@@@@@ -992,40 -992,40 -991,40 -992,40 -992,40 -992,40 -992,40 -992,40 -992,40 -992,40 -992,40 -1120,45 +1119,45 @@@@@@@@@@@@@
            # CONFIG_MDA_CONSOLE is not set
            CONFIG_DUMMY_CONSOLE=y
            CONFIG_FRAMEBUFFER_CONSOLE=y
+++++++++++ # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
            # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
            # CONFIG_FONTS is not set
            CONFIG_FONT_8x8=y
            CONFIG_FONT_8x16=y
----------- 
----------- #
----------- # Logo configuration
----------- #
            # CONFIG_LOGO is not set
            
            #
            # Sound
            #
            # CONFIG_SOUND is not set
+++++++++++ CONFIG_HID_SUPPORT=y
+++++++++++ CONFIG_HID=y
+++++++++++ # CONFIG_HID_DEBUG is not set
+++++++++++ # CONFIG_HIDRAW is not set
            
            #
----------- # HID Devices
+++++++++++ # USB Input Devices
            #
----------- CONFIG_HID=y
----------- # CONFIG_HID_DEBUG is not set
+++++++++++ # CONFIG_USB_HID is not set
            
            #
----------- # USB support
+++++++++++ # USB HID Boot Protocol drivers
            #
+++++++++++ # CONFIG_USB_KBD is not set
+++++++++++ # CONFIG_USB_MOUSE is not set
+++++++++++ CONFIG_USB_SUPPORT=y
            CONFIG_USB_ARCH_HAS_HCD=y
            CONFIG_USB_ARCH_HAS_OHCI=y
            # CONFIG_USB_ARCH_HAS_EHCI is not set
            CONFIG_USB=y
            # CONFIG_USB_DEBUG is not set
+++++++++++ # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
            
            #
            # Miscellaneous USB options
            #
            CONFIG_USB_DEVICEFS=y
+++++++++++ CONFIG_USB_DEVICE_CLASS=y
            # CONFIG_USB_DYNAMIC_MINORS is not set
            # CONFIG_USB_SUSPEND is not set
            # CONFIG_USB_OTG is not set
@@@@@@@@@@@@@ -1033,18 -1033,18 -1032,18 -1033,18 -1033,18 -1033,18 -1033,18 -1033,18 -1033,18 -1033,18 -1033,18 -1166,22 +1165,22 @@@@@@@@@@@@@
            #
            # USB Host Controller Drivers
            #
+++++++++++ # CONFIG_USB_C67X00_HCD is not set
            # CONFIG_USB_ISP116X_HCD is not set
+++++++++++ # CONFIG_USB_ISP1760_HCD is not set
            CONFIG_USB_OHCI_HCD=y
            # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
            # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
            CONFIG_USB_OHCI_LITTLE_ENDIAN=y
            # CONFIG_USB_SL811_HCD is not set
+++++++++++ # CONFIG_USB_R8A66597_HCD is not set
            
            #
            # USB Device Class drivers
            #
----------- # CONFIG_USB_ACM is not set
----------- # CONFIG_USB_PRINTER is not set
+++++++++++ CONFIG_USB_ACM=m
+++++++++++ CONFIG_USB_PRINTER=m
+++++++++++ CONFIG_USB_WDM=m
            
            #
            # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@@@@@@@@@@@@ -1053,57 -1053,57 -1052,57 -1053,57 -1053,57 -1053,57 -1053,57 -1053,57 -1053,57 -1053,57 -1053,57 -1190,78 +1189,78 @@@@@@@@@@@@@
            #
            # may also be needed; see USB_STORAGE Help for more information
            #
----------- # CONFIG_USB_LIBUSUAL is not set
----------- 
----------- #
----------- # USB Input Devices
----------- #
----------- # CONFIG_USB_HID is not set
----------- 
----------- #
----------- # USB HID Boot Protocol drivers
----------- #
----------- # CONFIG_USB_KBD is not set
----------- # CONFIG_USB_MOUSE is not set
----------- # CONFIG_USB_AIPTEK is not set
----------- # CONFIG_USB_WACOM is not set
----------- # CONFIG_USB_ACECAD is not set
----------- # CONFIG_USB_KBTAB is not set
----------- # CONFIG_USB_POWERMATE is not set
----------- # CONFIG_USB_TOUCHSCREEN is not set
----------- # CONFIG_USB_YEALINK is not set
----------- # CONFIG_USB_XPAD is not set
----------- # CONFIG_USB_ATI_REMOTE is not set
----------- # CONFIG_USB_ATI_REMOTE2 is not set
----------- # CONFIG_USB_KEYSPAN_REMOTE is not set
----------- # CONFIG_USB_APPLETOUCH is not set
----------- # CONFIG_USB_GTCO is not set
+++++++++++ CONFIG_USB_STORAGE=m
+++++++++++ # CONFIG_USB_STORAGE_DEBUG is not set
+++++++++++ # CONFIG_USB_STORAGE_DATAFAB is not set
+++++++++++ # CONFIG_USB_STORAGE_FREECOM is not set
+++++++++++ # CONFIG_USB_STORAGE_ISD200 is not set
+++++++++++ # CONFIG_USB_STORAGE_DPCM is not set
+++++++++++ # CONFIG_USB_STORAGE_USBAT is not set
+++++++++++ # CONFIG_USB_STORAGE_SDDR09 is not set
+++++++++++ # CONFIG_USB_STORAGE_SDDR55 is not set
+++++++++++ # CONFIG_USB_STORAGE_JUMPSHOT is not set
+++++++++++ # CONFIG_USB_STORAGE_ALAUDA is not set
+++++++++++ # CONFIG_USB_STORAGE_ONETOUCH is not set
+++++++++++ # CONFIG_USB_STORAGE_KARMA is not set
+++++++++++ # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+++++++++++ CONFIG_USB_LIBUSUAL=y
            
            #
            # USB Imaging devices
            #
            # CONFIG_USB_MDC800 is not set
----------- 
----------- #
----------- # USB Network Adapters
----------- #
----------- # CONFIG_USB_CATC is not set
----------- # CONFIG_USB_KAWETH is not set
----------- # CONFIG_USB_PEGASUS is not set
----------- # CONFIG_USB_RTL8150 is not set
----------- # CONFIG_USB_USBNET_MII is not set
----------- # CONFIG_USB_USBNET is not set
+++++++++++ # CONFIG_USB_MICROTEK is not set
            CONFIG_USB_MON=y
            
            #
            # USB port drivers
            #
            # CONFIG_USB_USS720 is not set
----------- 
----------- #
----------- # USB Serial Converter support
----------- #
----------- # CONFIG_USB_SERIAL is not set
+++++++++++ CONFIG_USB_SERIAL=y
+++++++++++ # CONFIG_USB_SERIAL_CONSOLE is not set
+++++++++++ # CONFIG_USB_EZUSB is not set
+++++++++++ CONFIG_USB_SERIAL_GENERIC=y
+++++++++++ # CONFIG_USB_SERIAL_AIRCABLE is not set
+++++++++++ # CONFIG_USB_SERIAL_AIRPRIME is not set
+++++++++++ # CONFIG_USB_SERIAL_ARK3116 is not set
+++++++++++ # CONFIG_USB_SERIAL_BELKIN is not set
+++++++++++ # CONFIG_USB_SERIAL_CH341 is not set
+++++++++++ # CONFIG_USB_SERIAL_WHITEHEAT is not set
+++++++++++ # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+++++++++++ # CONFIG_USB_SERIAL_CP2101 is not set
+++++++++++ # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+++++++++++ # CONFIG_USB_SERIAL_EMPEG is not set
+++++++++++ CONFIG_USB_SERIAL_FTDI_SIO=y
+++++++++++ # CONFIG_USB_SERIAL_FUNSOFT is not set
+++++++++++ # CONFIG_USB_SERIAL_VISOR is not set
+++++++++++ # CONFIG_USB_SERIAL_IPAQ is not set
+++++++++++ # CONFIG_USB_SERIAL_IR is not set
+++++++++++ # CONFIG_USB_SERIAL_EDGEPORT is not set
+++++++++++ # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+++++++++++ # CONFIG_USB_SERIAL_GARMIN is not set
+++++++++++ # CONFIG_USB_SERIAL_IPW is not set
+++++++++++ # CONFIG_USB_SERIAL_IUU is not set
+++++++++++ # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+++++++++++ # CONFIG_USB_SERIAL_KEYSPAN is not set
+++++++++++ # CONFIG_USB_SERIAL_KLSI is not set
+++++++++++ # CONFIG_USB_SERIAL_KOBIL_SCT is not set
+++++++++++ # CONFIG_USB_SERIAL_MCT_U232 is not set
+++++++++++ # CONFIG_USB_SERIAL_MOS7720 is not set
+++++++++++ # CONFIG_USB_SERIAL_MOS7840 is not set
+++++++++++ # CONFIG_USB_SERIAL_MOTOROLA is not set
+++++++++++ CONFIG_USB_SERIAL_NAVMAN=m
+++++++++++ CONFIG_USB_SERIAL_PL2303=y
+++++++++++ # CONFIG_USB_SERIAL_OTI6858 is not set
+++++++++++ # CONFIG_USB_SERIAL_SPCP8X5 is not set
+++++++++++ # CONFIG_USB_SERIAL_HP4X is not set
+++++++++++ # CONFIG_USB_SERIAL_SAFE is not set
+++++++++++ # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+++++++++++ # CONFIG_USB_SERIAL_TI is not set
+++++++++++ # CONFIG_USB_SERIAL_CYBERJACK is not set
+++++++++++ # CONFIG_USB_SERIAL_XIRCOM is not set
+++++++++++ CONFIG_USB_SERIAL_OPTION=m
+++++++++++ # CONFIG_USB_SERIAL_OMNINET is not set
+++++++++++ # CONFIG_USB_SERIAL_DEBUG is not set
            
            #
            # USB Miscellaneous drivers
@@@@@@@@@@@@@ -1116,35 -1116,35 -1115,35 -1116,35 -1116,35 -1116,35 -1116,35 -1116,35 -1116,35 -1116,35 -1116,35 -1274,38 +1273,38 @@@@@@@@@@@@@
            # CONFIG_USB_LEGOTOWER is not set
            # CONFIG_USB_LCD is not set
            # CONFIG_USB_BERRY_CHARGE is not set
----------- # CONFIG_USB_LED is not set
+++++++++++ CONFIG_USB_LED=m
            # CONFIG_USB_CYPRESS_CY7C63 is not set
            # CONFIG_USB_CYTHERM is not set
            # CONFIG_USB_PHIDGET is not set
            # CONFIG_USB_IDMOUSE is not set
            # CONFIG_USB_FTDI_ELAN is not set
            # CONFIG_USB_APPLEDISPLAY is not set
----------- # CONFIG_USB_LD is not set
+++++++++++ CONFIG_USB_LD=m
            # CONFIG_USB_TRANCEVIBRATOR is not set
            # CONFIG_USB_IOWARRIOR is not set
            # CONFIG_USB_TEST is not set
----------- 
----------- #
----------- # USB DSL modem support
----------- #
----------- 
----------- #
----------- # USB Gadget Support
----------- #
+++++++++++ # CONFIG_USB_ISIGHTFW is not set
            # CONFIG_USB_GADGET is not set
+++++++++++ # CONFIG_MMC is not set
+++++++++++ CONFIG_NEW_LEDS=y
+++++++++++ CONFIG_LEDS_CLASS=m
            
            #
----------- # MMC/SD Card support
+++++++++++ # LED drivers
            #
----------- # CONFIG_MMC is not set
+++++++++++ CONFIG_LEDS_S3C24XX=m
+++++++++++ CONFIG_LEDS_H1940=m
+++++++++++ # CONFIG_LEDS_GPIO is not set
            
            #
----------- # Real Time Clock
+++++++++++ # LED Triggers
            #
+++++++++++ CONFIG_LEDS_TRIGGERS=y
+++++++++++ CONFIG_LEDS_TRIGGER_TIMER=m
+++++++++++ # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+++++++++++ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+++++++++++ # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
            CONFIG_RTC_LIB=y
            CONFIG_RTC_CLASS=y
            CONFIG_RTC_HCTOSYS=y
@@@@@@@@@@@@@ -1158,61 -1158,61 -1157,61 -1158,61 -1158,61 -1158,61 -1158,61 -1158,61 -1158,61 -1158,61 -1158,61 -1319,86 +1318,86 @@@@@@@@@@@@@ CONFIG_RTC_INTF_SYSFS=
            CONFIG_RTC_INTF_PROC=y
            CONFIG_RTC_INTF_DEV=y
            # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+++++++++++ # CONFIG_RTC_DRV_TEST is not set
            
            #
----------- # RTC drivers
+++++++++++ # I2C RTC drivers
            #
----------- # CONFIG_RTC_DRV_CMOS is not set
----------- # CONFIG_RTC_DRV_X1205 is not set
            # CONFIG_RTC_DRV_DS1307 is not set
----------- # CONFIG_RTC_DRV_DS1553 is not set
----------- # CONFIG_RTC_DRV_ISL1208 is not set
+++++++++++ # CONFIG_RTC_DRV_DS1374 is not set
            # CONFIG_RTC_DRV_DS1672 is not set
----------- # CONFIG_RTC_DRV_DS1742 is not set
+++++++++++ # CONFIG_RTC_DRV_MAX6900 is not set
+++++++++++ # CONFIG_RTC_DRV_RS5C372 is not set
+++++++++++ # CONFIG_RTC_DRV_ISL1208 is not set
+++++++++++ # CONFIG_RTC_DRV_X1205 is not set
            # CONFIG_RTC_DRV_PCF8563 is not set
+++++++++++ # CONFIG_RTC_DRV_PCF8583 is not set
+++++++++++ # CONFIG_RTC_DRV_M41T80 is not set
+++++++++++ # CONFIG_RTC_DRV_S35390A is not set
+++++++++++ # CONFIG_RTC_DRV_FM3130 is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # SPI RTC drivers
+++++++++++ #
+++++++++++ # CONFIG_RTC_DRV_MAX6902 is not set
+++++++++++ # CONFIG_RTC_DRV_R9701 is not set
            # CONFIG_RTC_DRV_RS5C348 is not set
----------- # CONFIG_RTC_DRV_RS5C372 is not set
----------- CONFIG_RTC_DRV_S3C=y
+++++++++++ 
+++++++++++ #
+++++++++++ # Platform RTC drivers
+++++++++++ #
+++++++++++ # CONFIG_RTC_DRV_CMOS is not set
+++++++++++ # CONFIG_RTC_DRV_DS1511 is not set
+++++++++++ # CONFIG_RTC_DRV_DS1553 is not set
+++++++++++ # CONFIG_RTC_DRV_DS1742 is not set
+++++++++++ # CONFIG_RTC_DRV_STK17TA8 is not set
            # CONFIG_RTC_DRV_M48T86 is not set
----------- # CONFIG_RTC_DRV_TEST is not set
----------- # CONFIG_RTC_DRV_MAX6902 is not set
+++++++++++ # CONFIG_RTC_DRV_M48T59 is not set
            # CONFIG_RTC_DRV_V3020 is not set
            
+++++++++++ #
+++++++++++ # on-CPU RTC drivers
+++++++++++ #
+++++++++++ CONFIG_RTC_DRV_S3C=y
+++++++++++ # CONFIG_UIO is not set
+++++++++++ 
            #
            # File systems
            #
            CONFIG_EXT2_FS=y
----------- # CONFIG_EXT2_FS_XATTR is not set
+++++++++++ CONFIG_EXT2_FS_XATTR=y
+++++++++++ CONFIG_EXT2_FS_POSIX_ACL=y
+++++++++++ CONFIG_EXT2_FS_SECURITY=y
            # CONFIG_EXT2_FS_XIP is not set
            CONFIG_EXT3_FS=y
            CONFIG_EXT3_FS_XATTR=y
----------- # CONFIG_EXT3_FS_POSIX_ACL is not set
+++++++++++ CONFIG_EXT3_FS_POSIX_ACL=y
            # CONFIG_EXT3_FS_SECURITY is not set
            # CONFIG_EXT4DEV_FS is not set
            CONFIG_JBD=y
----------- # CONFIG_JBD_DEBUG is not set
            CONFIG_FS_MBCACHE=y
            # CONFIG_REISERFS_FS is not set
            # CONFIG_JFS_FS is not set
----------- # CONFIG_FS_POSIX_ACL is not set
+++++++++++ CONFIG_FS_POSIX_ACL=y
            # CONFIG_XFS_FS is not set
----------- # CONFIG_GFS2_FS is not set
            # CONFIG_OCFS2_FS is not set
----------- # CONFIG_MINIX_FS is not set
----------- CONFIG_ROMFS_FS=y
+++++++++++ CONFIG_DNOTIFY=y
            CONFIG_INOTIFY=y
            CONFIG_INOTIFY_USER=y
            # CONFIG_QUOTA is not set
----------- CONFIG_DNOTIFY=y
            # CONFIG_AUTOFS_FS is not set
            # CONFIG_AUTOFS4_FS is not set
            # CONFIG_FUSE_FS is not set
+++++++++++ CONFIG_GENERIC_ACL=y
            
            #
            # CD-ROM/DVD Filesystems
            #
----------- # CONFIG_ISO9660_FS is not set
----------- # CONFIG_UDF_FS is not set
+++++++++++ CONFIG_ISO9660_FS=y
+++++++++++ CONFIG_JOLIET=y
+++++++++++ # CONFIG_ZISOFS is not set
+++++++++++ CONFIG_UDF_FS=m
+++++++++++ CONFIG_UDF_NLS=y
            
            #
            # DOS/FAT/NT Filesystems
@@@@@@@@@@@@@ -1222,7 -1222,7 -1221,7 -1222,7 -1222,7 -1222,7 -1222,7 -1222,7 -1222,7 -1222,7 -1222,7 -1408,9 +1407,9 @@@@@@@@@@@@@ CONFIG_MSDOS_FS=
            CONFIG_VFAT_FS=y
            CONFIG_FAT_DEFAULT_CODEPAGE=437
            CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
----------- # CONFIG_NTFS_FS is not set
+++++++++++ CONFIG_NTFS_FS=m
+++++++++++ # CONFIG_NTFS_DEBUG is not set
+++++++++++ # CONFIG_NTFS_RW is not set
            
            #
            # Pseudo filesystems
@@@@@@@@@@@@@ -1230,10 -1230,10 -1229,10 -1230,10 -1230,10 -1230,10 -1230,10 -1230,10 -1230,10 -1230,10 -1230,10 -1418,10 +1417,10 @@@@@@@@@@@@@
            CONFIG_PROC_FS=y
            CONFIG_PROC_SYSCTL=y
            CONFIG_SYSFS=y
----------- # CONFIG_TMPFS is not set
+++++++++++ CONFIG_TMPFS=y
+++++++++++ CONFIG_TMPFS_POSIX_ACL=y
            # CONFIG_HUGETLB_PAGE is not set
----------- CONFIG_RAMFS=y
----------- # CONFIG_CONFIGFS_FS is not set
+++++++++++ CONFIG_CONFIGFS_FS=m
            
            #
            # Miscellaneous filesystems
@@@@@@@@@@@@@ -1248,31 -1248,31 -1247,31 -1248,31 -1248,31 -1248,31 -1248,31 -1248,31 -1248,31 -1248,31 -1248,31 -1436,32 +1435,32 @@@@@@@@@@@@@
            CONFIG_JFFS2_FS=y
            CONFIG_JFFS2_FS_DEBUG=0
            CONFIG_JFFS2_FS_WRITEBUFFER=y
----------- # CONFIG_JFFS2_SUMMARY is not set
+++++++++++ # CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+++++++++++ CONFIG_JFFS2_SUMMARY=y
            # CONFIG_JFFS2_FS_XATTR is not set
            # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
            CONFIG_JFFS2_ZLIB=y
+++++++++++ # CONFIG_JFFS2_LZO is not set
            CONFIG_JFFS2_RTIME=y
            # CONFIG_JFFS2_RUBIN is not set
            CONFIG_CRAMFS=y
            # CONFIG_VXFS_FS is not set
+++++++++++ # CONFIG_MINIX_FS is not set
            # CONFIG_HPFS_FS is not set
            # CONFIG_QNX4FS_FS is not set
+++++++++++ CONFIG_ROMFS_FS=y
            # CONFIG_SYSV_FS is not set
            # CONFIG_UFS_FS is not set
----------- 
----------- #
----------- # Network File Systems
----------- #
+++++++++++ CONFIG_NETWORK_FILESYSTEMS=y
            CONFIG_NFS_FS=y
            # CONFIG_NFS_V3 is not set
            # CONFIG_NFS_V4 is not set
----------- # CONFIG_NFS_DIRECTIO is not set
            # CONFIG_NFSD is not set
            CONFIG_ROOT_NFS=y
            CONFIG_LOCKD=y
            CONFIG_NFS_COMMON=y
            CONFIG_SUNRPC=y
+++++++++++ # CONFIG_SUNRPC_BIND34 is not set
            # CONFIG_RPCSEC_GSS_KRB5 is not set
            # CONFIG_RPCSEC_GSS_SPKM3 is not set
            # CONFIG_SMB_FS is not set
@@@@@@@@@@@@@ -1280,7 -1280,7 -1279,7 -1280,7 -1280,7 -1280,7 -1280,7 -1280,7 -1280,7 -1280,7 -1280,7 -1469,6 +1468,6 @@@@@@@@@@@@@
            # CONFIG_NCP_FS is not set
            # CONFIG_CODA_FS is not set
            # CONFIG_AFS_FS is not set
----------- # CONFIG_9P_FS is not set
            
            #
            # Partition Types
@@@@@@@@@@@@@ -1302,94 -1302,94 -1301,94 -1302,94 -1302,94 -1302,94 -1302,94 -1302,94 -1302,94 -1302,94 -1302,94 -1490,93 +1489,93 @@@@@@@@@@@@@ CONFIG_SOLARIS_X86_PARTITION=
            # CONFIG_SUN_PARTITION is not set
            # CONFIG_KARMA_PARTITION is not set
            # CONFIG_EFI_PARTITION is not set
----------- 
----------- #
----------- # Native Language Support
----------- #
+++++++++++ # CONFIG_SYSV68_PARTITION is not set
            CONFIG_NLS=y
            CONFIG_NLS_DEFAULT="iso8859-1"
----------- # CONFIG_NLS_CODEPAGE_437 is not set
----------- # CONFIG_NLS_CODEPAGE_737 is not set
----------- # CONFIG_NLS_CODEPAGE_775 is not set
----------- # CONFIG_NLS_CODEPAGE_850 is not set
----------- # CONFIG_NLS_CODEPAGE_852 is not set
----------- # CONFIG_NLS_CODEPAGE_855 is not set
----------- # CONFIG_NLS_CODEPAGE_857 is not set
----------- # CONFIG_NLS_CODEPAGE_860 is not set
----------- # CONFIG_NLS_CODEPAGE_861 is not set
----------- # CONFIG_NLS_CODEPAGE_862 is not set
----------- # CONFIG_NLS_CODEPAGE_863 is not set
----------- # CONFIG_NLS_CODEPAGE_864 is not set
----------- # CONFIG_NLS_CODEPAGE_865 is not set
----------- # CONFIG_NLS_CODEPAGE_866 is not set
----------- # CONFIG_NLS_CODEPAGE_869 is not set
----------- # CONFIG_NLS_CODEPAGE_936 is not set
----------- # CONFIG_NLS_CODEPAGE_950 is not set
----------- # CONFIG_NLS_CODEPAGE_932 is not set
----------- # CONFIG_NLS_CODEPAGE_949 is not set
----------- # CONFIG_NLS_CODEPAGE_874 is not set
----------- # CONFIG_NLS_ISO8859_8 is not set
----------- # CONFIG_NLS_CODEPAGE_1250 is not set
----------- # CONFIG_NLS_CODEPAGE_1251 is not set
----------- # CONFIG_NLS_ASCII is not set
----------- # CONFIG_NLS_ISO8859_1 is not set
----------- # CONFIG_NLS_ISO8859_2 is not set
----------- # CONFIG_NLS_ISO8859_3 is not set
----------- # CONFIG_NLS_ISO8859_4 is not set
----------- # CONFIG_NLS_ISO8859_5 is not set
----------- # CONFIG_NLS_ISO8859_6 is not set
----------- # CONFIG_NLS_ISO8859_7 is not set
----------- # CONFIG_NLS_ISO8859_9 is not set
----------- # CONFIG_NLS_ISO8859_13 is not set
----------- # CONFIG_NLS_ISO8859_14 is not set
----------- # CONFIG_NLS_ISO8859_15 is not set
----------- # CONFIG_NLS_KOI8_R is not set
----------- # CONFIG_NLS_KOI8_U is not set
----------- # CONFIG_NLS_UTF8 is not set
----------- 
----------- #
----------- # Distributed Lock Manager
----------- #
+++++++++++ CONFIG_NLS_CODEPAGE_437=y
+++++++++++ CONFIG_NLS_CODEPAGE_737=m
+++++++++++ CONFIG_NLS_CODEPAGE_775=m
+++++++++++ CONFIG_NLS_CODEPAGE_850=y
+++++++++++ CONFIG_NLS_CODEPAGE_852=m
+++++++++++ CONFIG_NLS_CODEPAGE_855=m
+++++++++++ CONFIG_NLS_CODEPAGE_857=m
+++++++++++ CONFIG_NLS_CODEPAGE_860=m
+++++++++++ CONFIG_NLS_CODEPAGE_861=m
+++++++++++ CONFIG_NLS_CODEPAGE_862=m
+++++++++++ CONFIG_NLS_CODEPAGE_863=m
+++++++++++ CONFIG_NLS_CODEPAGE_864=m
+++++++++++ CONFIG_NLS_CODEPAGE_865=m
+++++++++++ CONFIG_NLS_CODEPAGE_866=m
+++++++++++ CONFIG_NLS_CODEPAGE_869=m
+++++++++++ CONFIG_NLS_CODEPAGE_936=m
+++++++++++ CONFIG_NLS_CODEPAGE_950=m
+++++++++++ CONFIG_NLS_CODEPAGE_932=m
+++++++++++ CONFIG_NLS_CODEPAGE_949=m
+++++++++++ CONFIG_NLS_CODEPAGE_874=m
+++++++++++ CONFIG_NLS_ISO8859_8=m
+++++++++++ CONFIG_NLS_CODEPAGE_1250=m
+++++++++++ CONFIG_NLS_CODEPAGE_1251=m
+++++++++++ CONFIG_NLS_ASCII=y
+++++++++++ CONFIG_NLS_ISO8859_1=y
+++++++++++ CONFIG_NLS_ISO8859_2=m
+++++++++++ CONFIG_NLS_ISO8859_3=m
+++++++++++ CONFIG_NLS_ISO8859_4=m
+++++++++++ CONFIG_NLS_ISO8859_5=m
+++++++++++ CONFIG_NLS_ISO8859_6=m
+++++++++++ CONFIG_NLS_ISO8859_7=m
+++++++++++ CONFIG_NLS_ISO8859_9=m
+++++++++++ CONFIG_NLS_ISO8859_13=m
+++++++++++ CONFIG_NLS_ISO8859_14=m
+++++++++++ CONFIG_NLS_ISO8859_15=m
+++++++++++ CONFIG_NLS_KOI8_R=m
+++++++++++ CONFIG_NLS_KOI8_U=m
+++++++++++ CONFIG_NLS_UTF8=m
            # CONFIG_DLM is not set
            
----------- #
----------- # Profiling support
----------- #
----------- # CONFIG_PROFILING is not set
----------- 
            #
            # Kernel hacking
            #
            # CONFIG_PRINTK_TIME is not set
+++++++++++ CONFIG_ENABLE_WARN_DEPRECATED=y
            CONFIG_ENABLE_MUST_CHECK=y
+++++++++++ CONFIG_FRAME_WARN=1024
            CONFIG_MAGIC_SYSRQ=y
            # CONFIG_UNUSED_SYMBOLS is not set
            # CONFIG_DEBUG_FS is not set
            # CONFIG_HEADERS_CHECK is not set
            CONFIG_DEBUG_KERNEL=y
            # CONFIG_DEBUG_SHIRQ is not set
----------- CONFIG_LOG_BUF_SHIFT=16
            CONFIG_DETECT_SOFTLOCKUP=y
+++++++++++ CONFIG_SCHED_DEBUG=y
            # CONFIG_SCHEDSTATS is not set
            # CONFIG_TIMER_STATS is not set
+++++++++++ # CONFIG_DEBUG_OBJECTS is not set
            # CONFIG_DEBUG_SLAB is not set
            # CONFIG_DEBUG_RT_MUTEXES is not set
            # CONFIG_RT_MUTEX_TESTER is not set
            # CONFIG_DEBUG_SPINLOCK is not set
            CONFIG_DEBUG_MUTEXES=y
+++++++++++ # CONFIG_DEBUG_LOCK_ALLOC is not set
+++++++++++ # CONFIG_PROVE_LOCKING is not set
+++++++++++ # CONFIG_LOCK_STAT is not set
            # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
            # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
            # CONFIG_DEBUG_KOBJECT is not set
            CONFIG_DEBUG_BUGVERBOSE=y
            CONFIG_DEBUG_INFO=y
            # CONFIG_DEBUG_VM is not set
+++++++++++ # CONFIG_DEBUG_WRITECOUNT is not set
            # CONFIG_DEBUG_LIST is not set
+++++++++++ # CONFIG_DEBUG_SG is not set
            CONFIG_FRAME_POINTER=y
----------- CONFIG_FORCED_INLINING=y
+++++++++++ # CONFIG_BOOT_PRINTK_DELAY is not set
            # CONFIG_RCU_TORTURE_TEST is not set
+++++++++++ # CONFIG_BACKTRACE_SELF_TEST is not set
            # CONFIG_FAULT_INJECTION is not set
+++++++++++ # CONFIG_SAMPLES is not set
            CONFIG_DEBUG_USER=y
----------- # CONFIG_DEBUG_ERRORS is not set
+++++++++++ CONFIG_DEBUG_ERRORS=y
+++++++++++ # CONFIG_DEBUG_STACK_USAGE is not set
            CONFIG_DEBUG_LL=y
            # CONFIG_DEBUG_ICEDCC is not set
            CONFIG_DEBUG_S3C_PORT=y
@@@@@@@@@@@@@ -1400,21 -1400,21 -1399,21 -1400,21 -1400,21 -1400,21 -1400,21 -1400,21 -1400,21 -1400,21 -1400,21 -1587,100 +1586,100 @@@@@@@@@@@@@ CONFIG_DEBUG_S3C_UART=
            #
            # CONFIG_KEYS is not set
            # CONFIG_SECURITY is not set
+++++++++++ # CONFIG_SECURITY_FILE_CAPABILITIES is not set
+++++++++++ CONFIG_CRYPTO=y
+++++++++++ 
+++++++++++ #
+++++++++++ # Crypto core or helper
+++++++++++ #
+++++++++++ CONFIG_CRYPTO_ALGAPI=m
+++++++++++ CONFIG_CRYPTO_AEAD=m
+++++++++++ CONFIG_CRYPTO_BLKCIPHER=m
+++++++++++ CONFIG_CRYPTO_HASH=m
+++++++++++ CONFIG_CRYPTO_MANAGER=m
+++++++++++ # CONFIG_CRYPTO_GF128MUL is not set
+++++++++++ # CONFIG_CRYPTO_NULL is not set
+++++++++++ # CONFIG_CRYPTO_CRYPTD is not set
+++++++++++ CONFIG_CRYPTO_AUTHENC=m
+++++++++++ # CONFIG_CRYPTO_TEST is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Authenticated Encryption with Associated Data
+++++++++++ #
+++++++++++ # CONFIG_CRYPTO_CCM is not set
+++++++++++ # CONFIG_CRYPTO_GCM is not set
+++++++++++ # CONFIG_CRYPTO_SEQIV is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Block modes
+++++++++++ #
+++++++++++ CONFIG_CRYPTO_CBC=m
+++++++++++ # CONFIG_CRYPTO_CTR is not set
+++++++++++ # CONFIG_CRYPTO_CTS is not set
+++++++++++ CONFIG_CRYPTO_ECB=m
+++++++++++ # CONFIG_CRYPTO_LRW is not set
+++++++++++ # CONFIG_CRYPTO_PCBC is not set
+++++++++++ # CONFIG_CRYPTO_XTS is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Hash modes
+++++++++++ #
+++++++++++ CONFIG_CRYPTO_HMAC=m
+++++++++++ # CONFIG_CRYPTO_XCBC is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Digest
+++++++++++ #
+++++++++++ # CONFIG_CRYPTO_CRC32C is not set
+++++++++++ # CONFIG_CRYPTO_MD4 is not set
+++++++++++ CONFIG_CRYPTO_MD5=m
+++++++++++ # CONFIG_CRYPTO_MICHAEL_MIC is not set
+++++++++++ CONFIG_CRYPTO_SHA1=m
+++++++++++ # CONFIG_CRYPTO_SHA256 is not set
+++++++++++ # CONFIG_CRYPTO_SHA512 is not set
+++++++++++ # CONFIG_CRYPTO_TGR192 is not set
+++++++++++ # CONFIG_CRYPTO_WP512 is not set
+++++++++++ 
+++++++++++ #
+++++++++++ # Ciphers
+++++++++++ #
+++++++++++ CONFIG_CRYPTO_AES=m
+++++++++++ # CONFIG_CRYPTO_ANUBIS is not set
+++++++++++ CONFIG_CRYPTO_ARC4=m
+++++++++++ # CONFIG_CRYPTO_BLOWFISH is not set
+++++++++++ # CONFIG_CRYPTO_CAMELLIA is not set
+++++++++++ # CONFIG_CRYPTO_CAST5 is not set
+++++++++++ # CONFIG_CRYPTO_CAST6 is not set
+++++++++++ CONFIG_CRYPTO_DES=m
+++++++++++ # CONFIG_CRYPTO_FCRYPT is not set
+++++++++++ # CONFIG_CRYPTO_KHAZAD is not set
+++++++++++ # CONFIG_CRYPTO_SALSA20 is not set
+++++++++++ # CONFIG_CRYPTO_SEED is not set
+++++++++++ # CONFIG_CRYPTO_SERPENT is not set
+++++++++++ # CONFIG_CRYPTO_TEA is not set
+++++++++++ # CONFIG_CRYPTO_TWOFISH is not set
            
            #
----------- # Cryptographic options
+++++++++++ # Compression
            #
----------- # CONFIG_CRYPTO is not set
+++++++++++ CONFIG_CRYPTO_DEFLATE=m
+++++++++++ # CONFIG_CRYPTO_LZO is not set
+++++++++++ CONFIG_CRYPTO_HW=y
            
            #
            # Library routines
            #
            CONFIG_BITREVERSE=y
+++++++++++ # CONFIG_GENERIC_FIND_FIRST_BIT is not set
+++++++++++ # CONFIG_GENERIC_FIND_NEXT_BIT is not set
            # CONFIG_CRC_CCITT is not set
            # CONFIG_CRC16 is not set
+++++++++++ CONFIG_CRC_ITU_T=m
            CONFIG_CRC32=y
+++++++++++ # CONFIG_CRC7 is not set
            # CONFIG_LIBCRC32C is not set
            CONFIG_ZLIB_INFLATE=y
            CONFIG_ZLIB_DEFLATE=y
            CONFIG_PLIST=y
            CONFIG_HAS_IOMEM=y
+++++++++++ CONFIG_HAS_DMA=y

diff --combined arch/arm/mm/Kconfig
index 33ed048502a361b2204445e95ffc5e670dd8f645,750d895cd28705774cc640671bb5eb79b425d2fc,33ed048502a361b2204445e95ffc5e670dd8f645,33ed048502a361b2204445e95ffc5e670dd8f645,33ed048502a361b2204445e95ffc5e670dd8f645,76348f060f27473b71c71de0086ff70cf6ad26d7,33ed048502a361b2204445e95ffc5e670dd8f645,236603bbafdc73566ebae2ea20b7cb08820cb1ec,33ed048502a361b2204445e95ffc5e670dd8f645,33ed048502a361b2204445e95ffc5e670dd8f645,33ed048502a361b2204445e95ffc5e670dd8f645,33ed048502a361b2204445e95ffc5e670dd8f645..a2c8b006d7105597e6a71504cb9602dfb9fe04c2
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
--- 3/arch/arm/mm/Kconfig
--- 4/arch/arm/mm/Kconfig
--- 5/arch/arm/mm/Kconfig
--- 6/arch/arm/mm/Kconfig
--- 7/arch/arm/mm/Kconfig
--- 8/arch/arm/mm/Kconfig
--- 9/arch/arm/mm/Kconfig
--- 10/arch/arm/mm/Kconfig
--- 11/arch/arm/mm/Kconfig
--- 12/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@@@@@@@@@@@ -18,7 -18,7 -18,7 -18,7 -18,7 -18,6 -18,7 -18,7 -18,7 -18,7 -18,7 -18,7 +18,7 @@@@@@@@@@@@@ config CPU_ARM61
                select CPU_CP15_MMU
                select CPU_COPY_V3 if MMU
                select CPU_TLB_V3 if MMU
     +          select CPU_PABRT_NOIFAR
                help
                  The ARM610 is the successor to the ARM3 processor
                  and was produced by VLSI Technology Inc.
@@@@@@@@@@@@@ -32,7 -32,7 -32,7 -32,7 -32,7 -31,6 -32,7 -32,7 -32,7 -32,7 -32,7 -32,7 +32,7 @@@@@@@@@@@@@ config CPU_ARM7TDM
                depends on !MMU
                select CPU_32v4T
                select CPU_ABRT_LV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4
                help
                  A 32-bit RISC microprocessor based on the ARM7 processor core
@@@@@@@@@@@@@ -51,7 -51,7 -51,7 -51,7 -51,7 -49,6 -51,7 -51,7 -51,7 -51,7 -51,7 -51,7 +51,7 @@@@@@@@@@@@@ config CPU_ARM71
                select CPU_CP15_MMU
                select CPU_COPY_V3 if MMU
                select CPU_TLB_V3 if MMU
     +          select CPU_PABRT_NOIFAR
                help
                  A 32-bit RISC microprocessor based on the ARM7 processor core
                  designed by Advanced RISC Machines Ltd. The ARM710 is the
@@@@@@@@@@@@@ -67,7 -67,7 -67,7 -67,7 -67,7 -64,6 -67,7 -67,7 -67,7 -67,7 -67,7 -67,7 +67,7 @@@@@@@@@@@@@ config CPU_ARM720
                default y if ARCH_CLPS711X || ARCH_L7200 || ARCH_CDB89712 || ARCH_H720X
                select CPU_32v4T
                select CPU_ABRT_LV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -86,7 -86,7 -86,7 -86,7 -86,7 -82,6 -86,7 -86,7 -86,7 -86,7 -86,7 -86,7 +86,7 @@@@@@@@@@@@@ config CPU_ARM740
                depends on !MMU
                select CPU_32v4T
                select CPU_ABRT_LV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V3     # although the core is v4t
                select CPU_CP15_MPU
                help
@@@@@@@@@@@@@ -103,7 -103,7 -103,7 -103,7 -103,7 -98,6 -103,7 -103,7 -103,7 -103,7 -103,7 -103,7 +103,7 @@@@@@@@@@@@@ config CPU_ARM9TDM
                depends on !MMU
                select CPU_32v4T
                select CPU_ABRT_NOMMU
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4
                help
                  A 32-bit RISC microprocessor based on the ARM9 processor core
@@@@@@@@@@@@@ -119,7 -119,7 -119,7 -119,7 -119,7 -113,6 -119,7 -119,7 -119,7 -119,7 -119,7 -119,7 +119,7 @@@@@@@@@@@@@ config CPU_ARM920
                default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200
                select CPU_32v4T
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WT
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -142,7 -142,7 -142,7 -142,7 -142,7 -135,6 -142,7 -142,7 -142,7 -142,7 -142,7 -142,7 +142,7 @@@@@@@@@@@@@ config CPU_ARM922
                default y if ARCH_LH7A40X || ARCH_KS8695
                select CPU_32v4T
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WT
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -163,7 -163,7 -163,7 -163,7 -163,7 -155,6 -163,7 -163,7 -163,7 -163,7 -163,7 -163,7 +163,7 @@@@@@@@@@@@@ config CPU_ARM925
                default y if ARCH_OMAP15XX
                select CPU_32v4T
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WT
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -180,11 -180,11 -180,11 -180,11 -180,11 -171,10 -180,11 -180,11 -180,11 -180,11 -180,11 -180,11 +180,11 @@@@@@@@@@@@@
            # ARM926T
            config CPU_ARM926T
                bool "Support ARM926T processor"
- ----------    depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
- ----------    default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
+ ++++++++++    depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
+ ++++++++++    default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || ARCH_NS9XXX || ARCH_DAVINCI
                select CPU_32v5
                select CPU_ABRT_EV5TJ
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
                select CPU_COPY_V4WB if MMU
@@@@@@@@@@@@@ -203,7 -203,7 -203,7 -203,7 -203,7 -193,6 -203,7 -203,7 -203,7 -203,7 -203,7 -203,7 +203,7 @@@@@@@@@@@@@ config CPU_ARM940
                depends on !MMU
                select CPU_32v4T
                select CPU_ABRT_NOMMU
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MPU
                help
@@@@@@@@@@@@@ -221,7 -221,7 -221,7 -221,7 -221,7 -210,6 -221,7 -221,7 -221,7 -221,7 -221,7 -221,7 +221,7 @@@@@@@@@@@@@ config CPU_ARM946
                depends on !MMU
                select CPU_32v5
                select CPU_ABRT_NOMMU
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MPU
                help
@@@@@@@@@@@@@ -238,7 -238,7 -238,7 -238,7 -238,7 -226,6 -238,7 -238,7 -238,7 -238,7 -238,7 -238,7 +238,7 @@@@@@@@@@@@@ config CPU_ARM102
                depends on ARCH_INTEGRATOR
                select CPU_32v5
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WT
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -257,7 -257,7 -257,7 -257,7 -257,7 -244,6 -257,7 -257,7 -257,7 -257,7 -257,7 -257,7 +257,7 @@@@@@@@@@@@@ config CPU_ARM1020
                depends on ARCH_INTEGRATOR
                select CPU_32v5
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WT
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -271,7 -271,7 -271,7 -271,7 -271,7 -257,6 -271,7 -271,7 -271,7 -271,7 -271,7 -271,7 +271,7 @@@@@@@@@@@@@ config CPU_ARM102
                depends on ARCH_INTEGRATOR
                select CPU_32v5
                select CPU_ABRT_EV4T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
                select CPU_COPY_V4WB if MMU # can probably do better
@@@@@@@@@@@@@ -290,7 -290,7 -290,7 -290,7 -290,7 -275,6 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 +290,7 @@@@@@@@@@@@@ config CPU_ARM102
                depends on ARCH_INTEGRATOR
                select CPU_32v5
                select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
                select CPU_COPY_V4WB if MMU # can probably do better
@@@@@@@@@@@@@ -309,7 -309,7 -309,7 -309,7 -309,7 -293,6 -309,7 -309,7 -309,7 -309,7 -309,7 -309,7 +309,7 @@@@@@@@@@@@@ config CPU_SA11
                select CPU_32v3 if ARCH_RPC
                select CPU_32v4 if !ARCH_RPC
                select CPU_ABRT_EV4
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WB
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -331,7 -331,7 -331,7 -331,7 -331,7 -314,6 -331,7 -331,7 -331,7 -331,7 -331,7 -331,7 +331,7 @@@@@@@@@@@@@ config CPU_SA110
                default y
                select CPU_32v4
                select CPU_ABRT_EV4
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V4WB
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -344,7 -344,7 -344,7 -344,7 -344,7 -326,6 -344,7 -344,7 -344,7 -344,7 -344,7 -344,7 +344,7 @@@@@@@@@@@@@ config CPU_XSCAL
                default y
                select CPU_32v5
                select CPU_ABRT_EV5T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
                select CPU_TLB_V4WBI if MMU
@@@@@@@@@@@@@ -356,7 -356,7 -356,7 -356,7 -356,7 -337,6 -356,7 -356,7 -356,7 -356,7 -356,7 -356,7 +356,7 @@@@@@@@@@@@@ config CPU_XSC
                default y
                select CPU_32v5
                select CPU_ABRT_EV5T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
                select CPU_TLB_V4WBI if MMU
@@@@@@@@@@@@@ -365,15 -365,15 -365,15 -365,15 -365,15 -345,14 -365,15 -365,15 -365,15 -365,15 -365,15 -365,15 +365,15 @@@@@@@@@@@@@
            # Feroceon
            config CPU_FEROCEON
                bool
----- - ----    depends on ARCH_ORION5X
     -          depends on ARCH_ORION
+++++++ ++++    depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0
                default y
                select CPU_32v5
                select CPU_ABRT_EV5T
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_VIVT
                select CPU_CP15_MMU
     -          select CPU_COPY_V4WB if MMU
     -          select CPU_TLB_V4WBI if MMU
     +          select CPU_COPY_FEROCEON if MMU
----- - ----    select CPU_TLB_V4WBI if MMU
+++++++ ++++    select CPU_TLB_FEROCEON if MMU
            
            config CPU_FEROCEON_OLD_ID
                bool "Accept early Feroceon cores with an ARM926 ID"
@@@@@@@@@@@@@ -387,12 -387,12 -387,12 -387,12 -387,12 -366,11 -387,12 -387,12 -387,12 -387,12 -387,12 -387,12 +387,12 @@@@@@@@@@@@@
            # ARMv6
            config CPU_V6
                bool "Support ARM V6 processor"
     -          depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A
     +          depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
                default y if ARCH_MX3
                default y if ARCH_MSM7X00A
                select CPU_32v6
                select CPU_ABRT_EV6
     +          select CPU_PABRT_NOIFAR
                select CPU_CACHE_V6
                select CPU_CACHE_VIPT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -415,11 -415,11 -415,11 -415,11 -415,11 -393,10 -415,11 -415,11 -415,11 -415,11 -415,11 -415,11 +415,11 @@@@@@@@@@@@@ config CPU_32v6
            # ARMv7
            config CPU_V7
                bool "Support ARM V7 processor"
     -          depends on ARCH_INTEGRATOR
     +          depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB
                select CPU_32v6K
                select CPU_32v7
                select CPU_ABRT_EV7
     +          select CPU_PABRT_IFAR
                select CPU_CACHE_V7
                select CPU_CACHE_VIPT
                select CPU_CP15_MMU
@@@@@@@@@@@@@ -481,12 -481,12 -481,12 -481,12 -481,12 -458,6 -481,12 -481,12 -481,12 -481,12 -481,12 -481,12 +481,12 @@@@@@@@@@@@@ config CPU_ABRT_EV
            config CPU_ABRT_EV7
                bool
            
     +      config CPU_PABRT_IFAR
     +          bool
     +      
     +      config CPU_PABRT_NOIFAR
     +          bool
     +      
            # The cache model
            config CPU_CACHE_V3
                bool
@@@@@@@@@@@@@ -523,9 -523,9 -523,9 -523,9 -523,9 -494,6 -523,9 -523,9 -523,9 -523,9 -523,9 -523,9 +523,9 @@@@@@@@@@@@@ config CPU_COPY_V4W
            config CPU_COPY_V4WB
                bool
            
     +      config CPU_COPY_FEROCEON
     +          bool
     +      
            config CPU_COPY_V6
                bool
            
@@@@@@@@@@@@@ -551,6 -551,6 -551,6 -551,6 -551,6 -519,6 -551,6 -551,11 -551,6 -551,6 -551,6 -551,6 +551,11 @@@@@@@@@@@@@ config CPU_TLB_V4WB
                  ARM Architecture Version 4 TLB with writeback cache and invalidate
                  instruction cache entry.
            
+++++++ ++++config CPU_TLB_FEROCEON
+++++++ ++++    bool
+++++++ ++++    help
+++++++ ++++      Feroceon TLB (v4wbi with non-outer-cachable page table walks).
+++++++ ++++
            config CPU_TLB_V6
                bool
            
@@@@@@@@@@@@@ -604,13 -604,13 -604,13 -604,13 -604,13 -572,6 -604,13 -609,13 -604,13 -604,13 -604,13 -604,13 +609,13 @@@@@@@@@@@@@ config ARM_THUM
            
                  If you don't know what this all is, saying Y is a safe choice.
            
     +      config ARM_THUMBEE
     +          bool "Enable ThumbEE CPU extension"
     +          depends on CPU_V7
     +          help
     +            Say Y here if you have a CPU with the ThumbEE extension and code to
     +            make use of it. Say N for code that can run on CPUs without ThumbEE.
     +      
            config CPU_BIG_ENDIAN
                bool "Build big-endian kernel"
                depends on ARCH_SUPPORTS_BIG_ENDIAN
@@@@@@@@@@@@@ -661,7 -661,7 -661,7 -661,7 -661,7 -622,7 -661,7 -666,7 -661,7 -661,7 -661,7 -661,7 +666,7 @@@@@@@@@@@@@ config CPU_DCACHE_SIZ
            
            config CPU_DCACHE_WRITETHROUGH
                bool "Force write through D-cache"
     -          depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FEROCEON) && !CPU_DCACHE_DISABLE
     +          depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE
                default y if CPU_ARM925T
                help
                  Say Y here to use the data cache in writethrough mode. Unless you
@@@@@@@@@@@@@ -709,10 -709,10 -709,10 -709,10 -709,10 -670,6 -709,10 -714,18 -709,10 -709,10 -709,10 -709,10 +714,18 @@@@@@@@@@@@@ config OUTER_CACH
                bool
                default n
            
+++++++ ++++config CACHE_FEROCEON_L2
+++++++ ++++    bool "Enable the Feroceon L2 cache controller"
+++++++ ++++    depends on ARCH_KIRKWOOD || ARCH_MV78XX0
+++++++ ++++    default y
+++++++ ++++    select OUTER_CACHE
+++++++ ++++    help
+++++++ ++++      This option enables the Feroceon L2 cache controller.
+++++++ ++++
            config CACHE_L2X0
     -          bool
     +          bool "Enable the L2x0 outer cache controller"
     +          depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
     +          default y
                select OUTER_CACHE
     +          help
     +            This option enables the L2x0 PrimeCell.

diff --combined drivers/net/Kconfig
index f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,be3b13cf417741f9b715ea8b4da0d254ebf9711e,d27f54a2df77cd3c80bf10032a4403e531fca8cc,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,fe7b5ec09708adac2efa77442066a095608a802a,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7,9f6cc8a5607371b346622756bc96610b998204ac,f4182cfffe9d4c62c02b64b14d17d252a87dc6d7..45a41b597da91edabc42150bd826ae22cb5f6ee5
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
--- 3/drivers/net/Kconfig
--- 4/drivers/net/Kconfig
--- 5/drivers/net/Kconfig
--- 6/drivers/net/Kconfig
--- 7/drivers/net/Kconfig
--- 8/drivers/net/Kconfig
--- 9/drivers/net/Kconfig
--- 10/drivers/net/Kconfig
--- 11/drivers/net/Kconfig
--- 12/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@@@@@@@@@@@ -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 -217,7 +217,7 @@@@@@@@@@@@@ config MI
            
            config MACB
                tristate "Atmel MACB support"
- ----------    depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91CAP9
+ ++++++++++    depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
                select PHYLIB
                help
                  The Atmel MACB ethernet interface is found on many AT32 and AT91
@@@@@@@@@@@@@ -467,13 -467,13 -467,13 -467,13 -467,13 -467,6 -467,13 -467,13 -467,13 -467,13 -467,13 -467,13 +467,13 @@@@@@@@@@@@@ config SNI_8259
                  Say Y here to support the on-board Intel 82596 ethernet controller
                  built into SNI RM machines.
            
     +      config KORINA
     +          tristate "Korina (IDT RC32434) Ethernet support"
     +          depends on NET_ETHERNET && MIKROTIK_RB532
     +          help
     +            If you have a Mikrotik RouterBoard 500 or IDT RC32434
     +            based system say Y. Otherwise say N.
     +      
            config MIPS_JAZZ_SONIC
                tristate "MIPS JAZZ onboard SONIC Ethernet support"
                depends on MACH_JAZZ
@@@@@@@@@@@@@ -827,7 -827,7 -827,7 -827,7 -827,7 -820,7 -827,7 -827,7 -827,7 -827,7 -827,7 -827,7 +827,7 @@@@@@@@@@@@@ config ULTRA3
            
            config BFIN_MAC
                tristate "Blackfin 527/536/537 on-chip mac support"
     -          depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
     +          depends on NET_ETHERNET && (BF527 || BF537 || BF536)
                select CRC32
                select MII
                select PHYLIB
@@@@@@@@@@@@@ -1273,6 -1273,6 -1273,6 -1273,6 -1273,6 -1266,20 -1273,6 -1273,6 -1273,6 -1273,6 -1273,6 -1273,6 +1273,6 @@@@@@@@@@@@@ config PCNET3
                  To compile this driver as a module, choose M here. The module
                  will be called pcnet32.
            
     -      config PCNET32_NAPI
     -          bool "Use RX polling (NAPI)"
     -          depends on PCNET32
     -          help
     -            NAPI is a new driver API designed to reduce CPU and interrupt load
     -            when the driver is receiving lots of packets from the card. It is
     -            still somewhat experimental and thus not yet enabled by default.
     -      
     -            If your estimated Rx load is 10kpps or more, or if the card will be
     -            deployed on potentially unfriendly networks (e.g. in a firewall),
     -            then say Y here.
     -      
     -            If in doubt, say N.
     -      
            config AMD8111_ETH
                tristate "AMD 8111 (new PCI lance) support"
                depends on NET_PCI && PCI
@@@@@@@@@@@@@ -1353,7 -1353,7 -1353,7 -1353,7 -1353,7 -1360,7 -1353,7 -1353,7 -1353,7 -1353,7 -1353,7 -1353,7 +1353,7 @@@@@@@@@@@@@ config APRICO
            
            config B44
                tristate "Broadcom 440x/47xx ethernet support"
 --  -    -     depends on SSB_POSSIBLE
 ++  +    +     depends on SSB_POSSIBLE && HAS_DMA
                select SSB
                select MII
                help
@@@@@@@@@@@@@ -1424,7 -1424,7 -1424,7 -1424,7 -1424,7 -1431,7 -1424,7 -1424,7 -1424,7 -1424,7 -1424,7 -1424,7 +1424,7 @@@@@@@@@@@@@ config CS89x
            config TC35815
                tristate "TOSHIBA TC35815 Ethernet support"
                depends on NET_PCI && PCI && MIPS
     -          select MII
     +          select PHYLIB
            
            config EEPRO100
                tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
@@@@@@@@@@@@@ -1997,7 -1997,7 -1997,7 -1997,7 -1997,7 -2004,7 -1997,7 -1997,7 -1997,7 -1997,7 -1997,7 -1997,7 +1997,7 @@@@@@@@@@@@@ config E1000_DISABLE_PACKET_SPLI
            
            config E1000E
                tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
     -          depends on PCI
     +          depends on PCI && (!SPARC32 || BROKEN)
                ---help---
                  This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
                  ethernet family of adapters. For PCI or PCI-X e1000 adapters,
@@@@@@@@@@@@@ -2213,6 -2213,6 -2213,6 -2213,6 -2213,6 -2220,93 -2213,6 -2213,6 -2213,6 -2213,6 -2213,6 -2213,6 +2213,6 @@@@@@@@@@@@@ config SKY2_DEBU
            
                 If unsure, say N.
            
     -      config SK98LIN
     -          tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"
     -          depends on PCI
     -          ---help---
     -            Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
     -            compliant Gigabit Ethernet Adapter.
     -      
     -            This driver supports the original Yukon chipset. This driver is
     -            deprecated and will be removed from the kernel in the near future,
     -            it has been replaced by the skge driver. skge is cleaner and
     -            seems to work better.
     -      
     -            This driver does not support the newer Yukon2 chipset. A separate
     -            driver, sky2, is provided to support Yukon2-based adapters.
     -      
     -            The following adapters are supported by this driver:
     -              - 3Com 3C940 Gigabit LOM Ethernet Adapter
     -              - 3Com 3C941 Gigabit LOM Ethernet Adapter
     -              - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2970LX/2SC Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2970SX Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2970SX/2SC Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2970TX Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
     -              - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
     -              - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
     -              - EG1032 v2 Instant Gigabit Network Adapter
     -              - EG1064 v2 Instant Gigabit Network Adapter
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
     -              - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
     -              - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
     -              - Marvell RDK-8001 Adapter
     -              - Marvell RDK-8002 Adapter
     -              - Marvell RDK-8003 Adapter
     -              - Marvell RDK-8004 Adapter
     -              - Marvell RDK-8006 Adapter
     -              - Marvell RDK-8007 Adapter
     -              - Marvell RDK-8008 Adapter
     -              - Marvell RDK-8009 Adapter
     -              - Marvell RDK-8010 Adapter
     -              - Marvell RDK-8011 Adapter
     -              - Marvell RDK-8012 Adapter
     -              - Marvell RDK-8052 Adapter
     -              - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
     -              - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
     -              - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
     -              - SK-9521 10/100/1000Base-T Adapter
     -              - SK-9521 V2.0 10/100/1000Base-T Adapter
     -              - SK-9821 Gigabit Ethernet Server Adapter (SK-NET GE-T)
     -              - SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter
     -              - SK-9822 Gigabit Ethernet Server Adapter (SK-NET GE-T dual link)
     -              - SK-9841 Gigabit Ethernet Server Adapter (SK-NET GE-LX)
     -              - SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter
     -              - SK-9842 Gigabit Ethernet Server Adapter (SK-NET GE-LX dual link)
     -              - SK-9843 Gigabit Ethernet Server Adapter (SK-NET GE-SX)
     -              - SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter
     -              - SK-9844 Gigabit Ethernet Server Adapter (SK-NET GE-SX dual link)
     -              - SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter
     -              - SK-9861 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition)
     -              - SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
     -              - SK-9862 Gigabit Ethernet Server Adapter (SK-NET GE-SX Volition dual link)
     -              - SK-9871 Gigabit Ethernet Server Adapter (SK-NET GE-ZX)
     -              - SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
     -              - SK-9872 Gigabit Ethernet Server Adapter (SK-NET GE-ZX dual link)
     -              - SMC EZ Card 1000 (SMC9452TXV.2)
     -            
     -            The adapters support Jumbo Frames.
     -            The dual link adapters support link-failover and dual port features.
     -            Both Marvell Yukon and SysKonnect SK-98xx/SK-95xx adapters support 
     -            the scatter-gather functionality with sendfile(). Please refer to 
     -            <file:Documentation/networking/sk98lin.txt> for more information about
     -            optional driver parameters.
     -            Questions concerning this driver may be addressed to:
     -                <[email protected]>
     -            
     -            If you want to compile this driver as a module ( = code which can be
     -            inserted in and removed from the running kernel whenever you want),
     -            say M here and read <file:Documentation/kbuild/modules.txt>. The module will
     -            be called sk98lin. This is recommended.
     -      
            config VIA_VELOCITY
                tristate "VIA Velocity support"
                depends on PCI
@@@@@@@@@@@@@ -2264,7 -2264,7 -2264,7 -2264,7 -2264,7 -2358,6 -2264,7 -2264,7 -2264,7 -2264,7 -2264,7 -2264,7 +2264,7 @@@@@@@@@@@@@ config TSI108_ET
            config GELIC_NET
                tristate "PS3 Gigabit Ethernet driver"
                depends on PPC_PS3
     +          select PS3_SYS_MANAGER
                help
                  This driver supports the network device on the PS3 game
                  console.  This driver has built-in support for Ethernet.
@@@@@@@@@@@@@ -2322,7 -2322,7 -2322,7 -2322,7 -2322,7 -2415,7 -2322,7 -2322,7 -2322,7 -2322,7 -2322,7 -2322,7 +2322,7 @@@@@@@@@@@@@ config UGETH_TX_ON_DEMAN
            
            config MV643XX_ETH
                tristate "Marvell Discovery (643XX) and Orion ethernet support"
     -          depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION
     +          depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
                select MII
                help
                  This driver supports the gigabit ethernet MACs in the
@@@@@@@@@@@@@ -2426,7 -2426,7 -2426,7 -2426,7 -2426,7 -2519,7 -2426,7 -2426,7 -2426,7 -2426,7 -2426,7 -2426,7 +2426,7 @@@@@@@@@@@@@ config CHELSIO_T
            
            config EHEA
                tristate "eHEA Ethernet support"
 -        -     depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG
 +        +     depends on IBMEBUS && INET && SPARSEMEM
                select INET_LRO
                ---help---
                  This driver supports the IBM pSeries eHEA ethernet adapter.
@@@@@@@@@@@@@ -2542,7 -2542,7 -2542,7 -2542,7 -2542,7 -2635,7 -2542,7 -2542,7 -2542,7 -2542,7 -2542,7 -2542,7 +2542,7 @@@@@@@@@@@@@ config NI
            
            config PASEMI_MAC
                tristate "PA Semi 1/10Gbit MAC"
     -          depends on PPC64 && PCI
     +          depends on PPC_PASEMI && PCI
                select PHYLIB
                select INET_LRO
                help
@@@@@@@@@@@@@ -2579,7 -2579,7 -2579,7 -2579,7 -2579,7 -2672,6 -2579,7 -2579,7 -2579,7 -2579,7 -2579,7 -2579,7 +2579,7 @@@@@@@@@@@@@ config BNX2
                  To compile this driver as a module, choose M here: the module
                  will be called bnx2x.  This is recommended.
            
     +      source "drivers/net/sfc/Kconfig"
            
            endif # NETDEV_10000
            

diff --combined drivers/rtc/Kconfig
index 4949dc4859be662806b62eb60c487702648570eb,7fb4c48acc85bcf045b353eeea43970947e0db3a,6cc2c0330230fefc372193e275b7748aee32c112,4949dc4859be662806b62eb60c487702648570eb,4949dc4859be662806b62eb60c487702648570eb,9e7de63b26ef6c3c5c558c935bfaae28e3df1f3f,4949dc4859be662806b62eb60c487702648570eb,4949dc4859be662806b62eb60c487702648570eb,4949dc4859be662806b62eb60c487702648570eb,4949dc4859be662806b62eb60c487702648570eb,1b26eeb52c97c66f5096df18d8e28b4e96104291,4949dc4859be662806b62eb60c487702648570eb..fc85bf2e4a9752887566eb20f5a8eacbb897fb68
--- 1/drivers/rtc/Kconfig
--- 2/drivers/rtc/Kconfig
--- 3/drivers/rtc/Kconfig
--- 4/drivers/rtc/Kconfig
--- 5/drivers/rtc/Kconfig
--- 6/drivers/rtc/Kconfig
--- 7/drivers/rtc/Kconfig
--- 8/drivers/rtc/Kconfig
--- 9/drivers/rtc/Kconfig
--- 10/drivers/rtc/Kconfig
--- 11/drivers/rtc/Kconfig
--- 12/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@@@@@@@@@@@ -20,6 -20,6 -20,6 -20,6 -20,6 -20,10 -20,6 -20,6 -20,6 -20,6 -20,6 -20,6 +20,6 @@@@@@@@@@@@@ menuconfig RTC_CLAS
            
            if RTC_CLASS
            
     -      if GEN_RTC || RTC
     -      comment "Conflicting RTC option has been selected, check GEN_RTC and RTC"
     -      endif
     -      
            config RTC_HCTOSYS
                bool "Set system time from RTC on startup and resume"
                depends on RTC_CLASS = y
@@@@@@@@@@@@@ -248,7 -248,7 -248,7 -248,7 -248,7 -252,6 -248,7 -248,7 -248,7 -248,7 -248,7 -248,7 +248,7 @@@@@@@@@@@@@ config RTC_DRV_TWL9233
            
            config RTC_DRV_S35390A
                tristate "Seiko Instruments S-35390A"
     +          select BITREVERSE
                help
                  If you say yes here you will get support for the Seiko
                  Instruments S-35390A.
@@@@@@@@@@@@@ -256,17 -256,6 -256,6 -256,17 -256,17 -259,6 -256,17 -256,17 -256,17 -256,17 -256,6 -256,17 +256,17 @@@@@@@@@@@@@
                  This driver can also be built as a module. If so the module
                  will be called rtc-s35390a.
            
 ++  +    + config RTC_DRV_FM3130
 ++  +    +     tristate "Ramtron FM3130"
 ++  +    +     help
 ++  +    +       If you say Y here you will get support for the
 ++  +    +       Ramtron FM3130 RTC chips.
 ++  +    +       Ramtron FM3130 is a chip with two separate devices inside,
 ++  +    +       RTC clock and FRAM. This driver provides only RTC functionality.
 ++  +    + 
 ++  +    +       This driver can also be built as a module. If so the module
 ++  +    +       will be called rtc-fm3130.
 ++  +    + 
            endif # I2C
            
            comment "SPI RTC drivers"
@@@@@@@@@@@@@ -311,7 -300,7 -300,7 -311,7 -311,7 -303,6 -311,7 -311,7 -311,7 -311,7 -300,7 -311,7 +311,7 @@@@@@@@@@@@@ comment "Platform RTC drivers
            config RTC_DRV_CMOS
                tristate "PC-style 'CMOS'"
                depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS
     +          default y if X86
                help
                  Say "yes" here to get direct support for the real time clock
                  found in every PC or ACPI-based system, and some other boards.
@@@@@@@@@@@@@ -469,6 -458,6 -458,6 -469,6 -469,6 -460,6 -469,6 -469,6 -469,6 -469,6 -458,16 -469,6 +469,16 @@@@@@@@@@@@@ config RTC_DRV_VR41X
                  To compile this driver as a module, choose M here: the
                  module will be called rtc-vr41xx.
            
++++++++++ +config RTC_DRV_PL030
++++++++++ +    tristate "ARM AMBA PL030 RTC"
++++++++++ +    depends on ARM_AMBA
++++++++++ +    help
++++++++++ +      If you say Y here you will get access to ARM AMBA
++++++++++ +      PrimeCell PL030 RTC found on certain ARM SOCs.
++++++++++ +
++++++++++ +      To compile this driver as a module, choose M here: the
++++++++++ +      module will be called rtc-pl030.
++++++++++ +
            config RTC_DRV_PL031
                tristate "ARM AMBA PL031 RTC"
                depends on ARM_AMBA
@@@@@@@@@@@@@ -495,12 -484,13 -484,12 -495,12 -495,12 -486,12 -495,12 -495,12 -495,12 -495,12 -494,12 -495,12 +505,13 @@@@@@@@@@@@@ config RTC_DRV_AT91RM920
                  this is powered by the backup power supply.
            
            config RTC_DRV_AT91SAM9
- ----------    tristate "AT91SAM9x"
+ ++++++++++    tristate "AT91SAM9x/AT91CAP9"
                depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
                help
- ----------      RTC driver for the Atmel AT91SAM9x internal RTT (Real Time Timer).
- ----------      These timers are powered by the backup power supply (such as a
- ----------      small coin cell battery), but do not need to be used as RTCs.
+ ++++++++++      RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
+ ++++++++++      (Real Time Timer). These timers are powered by the backup power
+ ++++++++++      supply (such as a small coin cell battery), but do not need to
+ ++++++++++      be used as RTCs.
            
                  (On AT91SAM9rl chips you probably want to use the dedicated RTC
                  module and leave the RTT available for other uses.)
@@@@@@@@@@@@@ -545,12 -535,4 -534,4 -545,12 -545,12 -536,4 -545,12 -545,12 -545,12 -545,12 -544,4 -545,12 +556,12 @@@@@@@@@@@@@ config RTC_DRV_RS5C31
                help
                  If you say yes here you get support for the Ricoh RS5C313 RTC chips.
            
 ++  +    + config RTC_DRV_PPC
 ++  +    +        tristate "PowerPC machine dependent RTC support"
 ++  +    +        depends on PPC_MERGE
 ++  +    +        help
 ++  +    +      The PowerPC kernel has machine-specific functions for accessing
 ++  +    +      the RTC. This exposes that functionality through the generic RTC
 ++  +    +      class.
 ++  +    + 
            endif # RTC_CLASS

diff --combined drivers/rtc/Makefile
index b6e14d51670b83556c688458c044c3433be8900f,872f1218ff9f5d7e2480a8128b481a33e4a4d096,872f1218ff9f5d7e2480a8128b481a33e4a4d096,b6e14d51670b83556c688458c044c3433be8900f,b6e14d51670b83556c688458c044c3433be8900f,872f1218ff9f5d7e2480a8128b481a33e4a4d096,b6e14d51670b83556c688458c044c3433be8900f,b6e14d51670b83556c688458c044c3433be8900f,b6e14d51670b83556c688458c044c3433be8900f,b6e14d51670b83556c688458c044c3433be8900f,af3ee6652ce509a2a1dd5f4f49f0aafb7935e3fd,b6e14d51670b83556c688458c044c3433be8900f..b5d9d67df887f7be847d23e0ef7f7b6e4c0eb233
--- 1/drivers/rtc/Makefile
--- 2/drivers/rtc/Makefile
--- 3/drivers/rtc/Makefile
--- 4/drivers/rtc/Makefile
--- 5/drivers/rtc/Makefile
--- 6/drivers/rtc/Makefile
--- 7/drivers/rtc/Makefile
--- 8/drivers/rtc/Makefile
--- 9/drivers/rtc/Makefile
--- 10/drivers/rtc/Makefile
--- 11/drivers/rtc/Makefile
--- 12/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@@@@@@@@@@@ -31,7 -31,6 -31,6 -31,7 -31,7 -31,6 -31,7 -31,7 -31,7 -31,7 -31,6 -31,7 +31,7 @@@@@@@@@@@@@ obj-$(CONFIG_RTC_DRV_DS1553)  += rtc-ds1
            obj-$(CONFIG_RTC_DRV_DS1672)        += rtc-ds1672.o
            obj-$(CONFIG_RTC_DRV_DS1742)        += rtc-ds1742.o
            obj-$(CONFIG_RTC_DRV_EP93XX)        += rtc-ep93xx.o
 ++  +    + obj-$(CONFIG_RTC_DRV_FM3130)        += rtc-fm3130.o
            obj-$(CONFIG_RTC_DRV_ISL1208)       += rtc-isl1208.o
            obj-$(CONFIG_RTC_DRV_M41T80)        += rtc-m41t80.o
            obj-$(CONFIG_RTC_DRV_M48T59)        += rtc-m48t59.o
@@@@@@@@@@@@@ -41,8 -40,7 -40,7 -41,8 -41,8 -40,7 -41,8 -41,8 -41,8 -41,8 -40,8 -41,8 +41,9 @@@@@@@@@@@@@ obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-ma
            obj-$(CONFIG_RTC_DRV_OMAP)  += rtc-omap.o
            obj-$(CONFIG_RTC_DRV_PCF8563)       += rtc-pcf8563.o
            obj-$(CONFIG_RTC_DRV_PCF8583)       += rtc-pcf8583.o
++++++++++ +obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o
            obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o
 ++  +    + obj-$(CONFIG_RTC_DRV_PPC)   += rtc-ppc.o
            obj-$(CONFIG_RTC_DRV_R9701) += rtc-r9701.o
            obj-$(CONFIG_RTC_DRV_RS5C313)       += rtc-rs5c313.o
            obj-$(CONFIG_RTC_DRV_RS5C348)       += rtc-rs5c348.o

diff --combined drivers/rtc/rtc-sa1100.c
index 82f62d25f92180e01caecd6c4467a7fdbf92aa7e,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,ee253cc45de1e1b1ed0df26ce7c3e73d243b30b2,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,67421b0d3a7b33ff7e2b87d641a5e3e499e5fa98,82f62d25f92180e01caecd6c4467a7fdbf92aa7e,e31a687b44b9e033b781cbbfbbfae397f42ae688,82f62d25f92180e01caecd6c4467a7fdbf92aa7e..f47294c6014866e7c4800368b87c74c3c4f88edc
--- 1/drivers/rtc/rtc-sa1100.c
--- 2/drivers/rtc/rtc-sa1100.c
--- 3/drivers/rtc/rtc-sa1100.c
--- 4/drivers/rtc/rtc-sa1100.c
--- 5/drivers/rtc/rtc-sa1100.c
--- 6/drivers/rtc/rtc-sa1100.c
--- 7/drivers/rtc/rtc-sa1100.c
--- 8/drivers/rtc/rtc-sa1100.c
--- 9/drivers/rtc/rtc-sa1100.c
--- 10/drivers/rtc/rtc-sa1100.c
--- 11/drivers/rtc/rtc-sa1100.c
--- 12/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@@@@@@@@@@@@ -33,7 -33,7 -33,7 -33,7 -33,7 -33,7 -33,7 -33,7 -33,7 -33,7 -33,6 -33,7 +33,6 @@@@@@@@@@@@@
            
            #include <asm/hardware.h>
            #include <asm/irq.h>
---------- -#include <asm/rtc.h>
            
            #ifdef CONFIG_ARCH_PXA
            #include <asm/arch/pxa-regs.h>
@@@@@@@@@@@@@ -47,6 -47,6 -47,6 -47,6 -47,6 -47,6 -47,6 -47,6 -47,6 -47,6 -46,42 -47,6 +46,42 @@@@@@@@@@@@@ static unsigned long rtc_freq = 1024
            static struct rtc_time rtc_alarm;
            static DEFINE_SPINLOCK(sa1100_rtc_lock);
            
++++++++++ +static inline int rtc_periodic_alarm(struct rtc_time *tm)
++++++++++ +{
++++++++++ +    return  (tm->tm_year == -1) ||
++++++++++ +            ((unsigned)tm->tm_mon >= 12) ||
++++++++++ +            ((unsigned)(tm->tm_mday - 1) >= 31) ||
++++++++++ +            ((unsigned)tm->tm_hour > 23) ||
++++++++++ +            ((unsigned)tm->tm_min > 59) ||
++++++++++ +            ((unsigned)tm->tm_sec > 59);
++++++++++ +}
++++++++++ +
++++++++++ +/*
++++++++++ + * Calculate the next alarm time given the requested alarm time mask
++++++++++ + * and the current time.
++++++++++ + */
++++++++++ +static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc_time *alrm)
++++++++++ +{
++++++++++ +    unsigned long next_time;
++++++++++ +    unsigned long now_time;
++++++++++ +
++++++++++ +    next->tm_year = now->tm_year;
++++++++++ +    next->tm_mon = now->tm_mon;
++++++++++ +    next->tm_mday = now->tm_mday;
++++++++++ +    next->tm_hour = alrm->tm_hour;
++++++++++ +    next->tm_min = alrm->tm_min;
++++++++++ +    next->tm_sec = alrm->tm_sec;
++++++++++ +
++++++++++ +    rtc_tm_to_time(now, &now_time);
++++++++++ +    rtc_tm_to_time(next, &next_time);
++++++++++ +
++++++++++ +    if (next_time < now_time) {
++++++++++ +            /* Advance one day */
++++++++++ +            next_time += 60 * 60 * 24;
++++++++++ +            rtc_time_to_tm(next_time, next);
++++++++++ +    }
++++++++++ +}
++++++++++ +
            static int rtc_update_alarm(struct rtc_time *alrm)
            {
                struct rtc_time alarm_tm, now_tm;
@@@@@@@@@@@@@ -331,14 -331,14 -331,14 -331,14 -331,14 -331,14 -331,14 -331,14 -331,14 -331,14 -366,14 -331,14 +366,14 @@@@@@@@@@@@@ static int sa1100_rtc_probe(struct plat
                        RCNR = 0;
                }
            
++++++++ +++    device_init_wakeup(&pdev->dev, 1);
++++++++ +++
                rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
                                        THIS_MODULE);
            
                if (IS_ERR(rtc))
                        return PTR_ERR(rtc);
            
-------- ---    device_init_wakeup(&pdev->dev, 1);
-------- ---
                platform_set_drvdata(pdev, rtc);
            
                return 0;
@@@@@@@@@@@@@ -399,4 -399,4 -399,4 -399,4 -399,4 -399,3 -399,4 -399,4 -399,4 -399,4 -434,4 -399,4 +434,4 @@@@@@@@@@@@@ module_exit(sa1100_rtc_exit)
            MODULE_AUTHOR("Richard Purdie <[email protected]>");
            MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)");
            MODULE_LICENSE("GPL");
     +      MODULE_ALIAS("platform:sa1100-rtc");

diff --combined include/asm-arm/cacheflush.h
index 759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,559fb4af1f626dd58452604e1e05230c5f2c2536,b85d426bb5288c14bdf27e0c64b432448089b861,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3,759a97b56eed8a189f1669f2d3ce9eb7fffba7e3..70b0fe724b62686a3485b66e747b46300117d8ec
--- 1/include/asm-arm/cacheflush.h
--- 2/include/asm-arm/cacheflush.h
--- 3/include/asm-arm/cacheflush.h
--- 4/include/asm-arm/cacheflush.h
--- 5/include/asm-arm/cacheflush.h
--- 6/include/asm-arm/cacheflush.h
--- 7/include/asm-arm/cacheflush.h
--- 8/include/asm-arm/cacheflush.h
--- 9/include/asm-arm/cacheflush.h
--- 10/include/asm-arm/cacheflush.h
--- 11/include/asm-arm/cacheflush.h
--- 12/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@@@@@@@@@@@@ -95,11 -95,11 -95,11 -95,11 -95,11 -95,11 -95,11 -95,7 -95,11 -95,11 -95,11 -95,11 +95,7 @@@@@@@@@@@@@
            #endif
            
            #if defined(CONFIG_CPU_FEROCEON)
------- ----# ifdef _CACHE
------- ----#  define MULTI_CACHE 1
------- ----# else
------- ----#  define _CACHE feroceon
------- ----# endif
+++++++ ++++# define MULTI_CACHE 1
            #endif
            
            #if defined(CONFIG_CPU_V6)
@@@@@@@@@@@@@ -410,6 -410,6 -410,6 -410,6 -410,6 -410,6 -410,13 -406,6 -410,6 -410,6 -410,6 -410,6 +406,13 @@@@@@@@@@@@@ extern void flush_dcache_page(struct pa
            
            extern void __flush_dcache_page(struct address_space *mapping, struct page *page);
            
++++++ +++++static inline void __flush_icache_all(void)
++++++ +++++{
++++++ +++++    asm("mcr        p15, 0, %0, c7, c5, 0   @ invalidate I-cache\n"
++++++ +++++        :
++++++ +++++        : "r" (0));
++++++ +++++}
++++++ +++++
            #define ARCH_HAS_FLUSH_ANON_PAGE
            static inline void flush_anon_page(struct vm_area_struct *vma,
                                 struct page *page, unsigned long vmaddr)

diff --combined kernel/sysctl.c
index 29116652dca825943ed7cb8e70350108542ce641,d7ffdc59816ad3f822389d508f3c5ff1b030578d,76426d93007795ffcdf6ff8d8f9c7ce49c8f6049,29116652dca825943ed7cb8e70350108542ce641,29116652dca825943ed7cb8e70350108542ce641,b2a2d6889babc898794e7c7fb7907ef59a3b487b,29116652dca825943ed7cb8e70350108542ce641,29116652dca825943ed7cb8e70350108542ce641,29116652dca825943ed7cb8e70350108542ce641,29116652dca825943ed7cb8e70350108542ce641,d7ffdc59816ad3f822389d508f3c5ff1b030578d,29116652dca825943ed7cb8e70350108542ce641..f6d2e57b99a07cc92f6a41d210e8e677e965cb4d
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
--- 3/kernel/sysctl.c
--- 4/kernel/sysctl.c
--- 5/kernel/sysctl.c
--- 6/kernel/sysctl.c
--- 7/kernel/sysctl.c
--- 8/kernel/sysctl.c
--- 9/kernel/sysctl.c
--- 10/kernel/sysctl.c
--- 11/kernel/sysctl.c
--- 12/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@@@@@@@@@@@ -38,7 -38,7 -38,7 -38,7 -38,7 -38,6 -38,7 -38,7 -38,7 -38,7 -38,7 -38,7 +38,7 @@@@@@@@@@@@@
            #include <linux/writeback.h>
            #include <linux/hugetlb.h>
            #include <linux/initrd.h>
     +      #include <linux/key.h>
            #include <linux/times.h>
            #include <linux/limits.h>
            #include <linux/dcache.h>
@@@@@@@@@@@@@ -81,7 -81,6 -81,6 -81,7 -81,7 -80,6 -81,7 -81,7 -81,7 -81,7 -81,6 -81,7 +81,7 @@@@@@@@@@@@@ extern int compat_log
            extern int maps_protect;
            extern int sysctl_stat_interval;
            extern int latencytop_enabled;
 ++  +    + extern int sysctl_nr_open_min, sysctl_nr_open_max;
            
            /* Constants used for minimum and  maximum */
            #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM)
@@@@@@@@@@@@@ -132,8 -131,8 -131,6 -132,8 -132,8 -130,8 -132,8 -132,8 -132,8 -132,8 -131,8 -132,8 +132,6 @@@@@@@@@@@@@ extern int sysctl_userprocess_debug
            extern int spin_retry;
            #endif
            
-- ---------extern int sysctl_hz_timer;
-- ---------
            #ifdef CONFIG_BSD_PROCESS_ACCT
            extern int acct_parm[];
            #endif
@@@@@@@@@@@@@ -146,6 -145,6 -143,6 -146,6 -146,6 -144,12 -146,6 -146,6 -146,6 -146,6 -145,6 -146,6 +144,6 @@@@@@@@@@@@@ extern int no_unaligned_warning
            extern int max_lock_depth;
            #endif
            
     -      #ifdef CONFIG_SYSCTL_SYSCALL
     -      static int parse_table(int __user *, int, void __user *, size_t __user *,
     -                  void __user *, size_t, struct ctl_table *);
     -      #endif
     -      
     -      
            #ifdef CONFIG_PROC_SYSCTL
            static int proc_do_cad_pid(struct ctl_table *table, int write, struct file *filp,
                          void __user *buffer, size_t *lenp, loff_t *ppos);
@@@@@@@@@@@@@ -264,6 -263,6 -261,6 -264,6 -264,6 -268,17 -264,6 -264,6 -264,6 -264,6 -263,6 -264,6 +262,6 @@@@@@@@@@@@@ static struct ctl_table kern_table[] = 
                        .extra1         = &min_wakeup_granularity_ns,
                        .extra2         = &max_wakeup_granularity_ns,
                },
     -          {
     -                  .ctl_name       = CTL_UNNUMBERED,
     -                  .procname       = "sched_batch_wakeup_granularity_ns",
     -                  .data           = &sysctl_sched_batch_wakeup_granularity,
     -                  .maxlen         = sizeof(unsigned int),
     -                  .mode           = 0644,
     -                  .proc_handler   = &proc_dointvec_minmax,
     -                  .strategy       = &sysctl_intvec,
     -                  .extra1         = &min_wakeup_granularity_ns,
     -                  .extra2         = &max_wakeup_granularity_ns,
     -          },
                {
                        .ctl_name       = CTL_UNNUMBERED,
                        .procname       = "sched_child_runs_first",
@@@@@@@@@@@@@ -303,7 -302,7 -300,7 -303,7 -303,7 -318,7 -303,7 -303,7 -303,7 -303,7 -302,7 -303,7 +301,7 @@@@@@@@@@@@@
                        .data           = &sysctl_sched_rt_period,
                        .maxlen         = sizeof(unsigned int),
                        .mode           = 0644,
     -                  .proc_handler   = &proc_dointvec,
     +                  .proc_handler   = &sched_rt_handler,
                },
                {
                        .ctl_name       = CTL_UNNUMBERED,
@@@@@@@@@@@@@ -311,7 -310,7 -308,7 -311,7 -311,7 -326,7 -311,7 -311,7 -311,7 -311,7 -310,7 -311,7 +309,7 @@@@@@@@@@@@@
                        .data           = &sysctl_sched_rt_runtime,
                        .maxlen         = sizeof(int),
                        .mode           = 0644,
     -                  .proc_handler   = &proc_dointvec,
     +                  .proc_handler   = &sched_rt_handler,
                },
                {
                        .ctl_name       = CTL_UNNUMBERED,
@@@@@@@@@@@@@ -562,16 -561,16 -559,6 -562,16 -562,16 -577,16 -562,16 -562,16 -562,16 -562,16 -561,16 -562,16 +560,6 @@@@@@@@@@@@@
                        .mode           = 0644,
                        .proc_handler   = &proc_dointvec,
                },
-- ---------#endif
-- ---------#ifdef CONFIG_NO_IDLE_HZ
-- ---------    {
-- ---------            .ctl_name       = KERN_HZ_TIMER,
-- ---------            .procname       = "hz_timer",
-- ---------            .data           = &sysctl_hz_timer,
-- ---------            .maxlen         = sizeof(int),
-- ---------            .mode           = 0644,
-- ---------            .proc_handler   = &proc_dointvec,
-- ---------    },
            #endif
                {
                        .ctl_name       = KERN_S390_USER_DEBUG_LOGGING,
@@@@@@@@@@@@@ -805,14 -804,14 -792,14 -805,14 -805,14 -820,6 -805,14 -805,14 -805,14 -805,14 -804,14 -805,14 +793,14 @@@@@@@@@@@@@
                        .proc_handler   = &proc_dostring,
                        .strategy       = &sysctl_string,
                },
     +      #ifdef CONFIG_KEYS
     +          {
     +                  .ctl_name       = CTL_UNNUMBERED,
     +                  .procname       = "keys",
     +                  .mode           = 0555,
     +                  .child          = key_sysctls,
     +          },
     +      #endif
            /*
             * NOTE: do not add new entries to this table unless you have read
             * Documentation/sysctl/ctl_unnumbered.txt
@@@@@@@@@@@@@ -1191,9 -1190,7 -1178,7 -1191,9 -1191,9 -1198,7 -1191,9 -1191,9 -1191,9 -1191,9 -1190,7 -1191,9 +1179,9 @@@@@@@@@@@@@ static struct ctl_table fs_table[] = 
                        .data           = &sysctl_nr_open,
                        .maxlen         = sizeof(int),
                        .mode           = 0644,
 --  -    -             .proc_handler   = &proc_dointvec,
 ++  +    +             .proc_handler   = &proc_dointvec_minmax,
 ++  +    +             .extra1         = &sysctl_nr_open_min,
 ++  +    +             .extra2         = &sysctl_nr_open_max,
                },
                {
                        .ctl_name       = FS_DENTRY,
@@@@@@@@@@@@@ -1436,76 -1433,76 -1421,76 -1436,76 -1436,76 -1441,6 -1436,76 -1436,76 -1436,76 -1436,76 -1433,76 -1436,76 +1424,76 @@@@@@@@@@@@@ void register_sysctl_root(struct ctl_ta
            }
            
            #ifdef CONFIG_SYSCTL_SYSCALL
     +      /* Perform the actual read/write of a sysctl table entry. */
     +      static int do_sysctl_strategy(struct ctl_table_root *root,
     +                          struct ctl_table *table,
     +                          int __user *name, int nlen,
     +                          void __user *oldval, size_t __user *oldlenp,
     +                          void __user *newval, size_t newlen)
     +      {
     +          int op = 0, rc;
     +      
     +          if (oldval)
     +                  op |= 004;
     +          if (newval)
     +                  op |= 002;
     +          if (sysctl_perm(root, table, op))
     +                  return -EPERM;
     +      
     +          if (table->strategy) {
     +                  rc = table->strategy(table, name, nlen, oldval, oldlenp,
     +                                       newval, newlen);
     +                  if (rc < 0)
     +                          return rc;
     +                  if (rc > 0)
     +                          return 0;
     +          }
     +      
     +          /* If there is no strategy routine, or if the strategy returns
     +           * zero, proceed with automatic r/w */
     +          if (table->data && table->maxlen) {
     +                  rc = sysctl_data(table, name, nlen, oldval, oldlenp,
     +                                   newval, newlen);
     +                  if (rc < 0)
     +                          return rc;
     +          }
     +          return 0;
     +      }
     +      
     +      static int parse_table(int __user *name, int nlen,
     +                         void __user *oldval, size_t __user *oldlenp,
     +                         void __user *newval, size_t newlen,
     +                         struct ctl_table_root *root,
     +                         struct ctl_table *table)
     +      {
     +          int n;
     +      repeat:
     +          if (!nlen)
     +                  return -ENOTDIR;
     +          if (get_user(n, name))
     +                  return -EFAULT;
     +          for ( ; table->ctl_name || table->procname; table++) {
     +                  if (!table->ctl_name)
     +                          continue;
     +                  if (n == table->ctl_name) {
     +                          int error;
     +                          if (table->child) {
     +                                  if (sysctl_perm(root, table, 001))
     +                                          return -EPERM;
     +                                  name++;
     +                                  nlen--;
     +                                  table = table->child;
     +                                  goto repeat;
     +                          }
     +                          error = do_sysctl_strategy(root, table, name, nlen,
     +                                                     oldval, oldlenp,
     +                                                     newval, newlen);
     +                          return error;
     +                  }
     +          }
     +          return -ENOTDIR;
     +      }
     +      
            int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp,
                       void __user *newval, size_t newlen)
            {
@@@@@@@@@@@@@ -1523,8 -1520,8 -1508,8 -1523,8 -1523,8 -1458,7 -1523,8 -1523,8 -1523,8 -1523,8 -1520,8 -1523,8 +1511,8 @@@@@@@@@@@@@
                for (head = sysctl_head_next(NULL); head;
                                head = sysctl_head_next(head)) {
                        error = parse_table(name, nlen, oldval, oldlenp, 
     -                                          newval, newlen, head->ctl_table);
     +                                          newval, newlen,
     +                                          head->root, head->ctl_table);
                        if (error != -ENOTDIR) {
                                sysctl_head_finish(head);
                                break;
@@@@@@@@@@@@@ -1570,22 -1567,22 -1555,22 -1570,22 -1570,22 -1504,84 -1570,22 -1570,22 -1570,22 -1570,22 -1567,22 -1570,22 +1558,22 @@@@@@@@@@@@@ static int test_perm(int mode, int op
                return -EACCES;
            }
            
     -      int sysctl_perm(struct ctl_table *table, int op)
     +      int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
            {
                int error;
     +          int mode;
     +      
                error = security_sysctl(table, op);
                if (error)
                        return error;
     -          return test_perm(table->mode, op);
     -      }
     -      
     -      #ifdef CONFIG_SYSCTL_SYSCALL
     -      static int parse_table(int __user *name, int nlen,
     -                         void __user *oldval, size_t __user *oldlenp,
     -                         void __user *newval, size_t newlen,
     -                         struct ctl_table *table)
     -      {
     -          int n;
     -      repeat:
     -          if (!nlen)
     -                  return -ENOTDIR;
     -          if (get_user(n, name))
     -                  return -EFAULT;
     -          for ( ; table->ctl_name || table->procname; table++) {
     -                  if (!table->ctl_name)
     -                          continue;
     -                  if (n == table->ctl_name) {
     -                          int error;
     -                          if (table->child) {
     -                                  if (sysctl_perm(table, 001))
     -                                          return -EPERM;
     -                                  name++;
     -                                  nlen--;
     -                                  table = table->child;
     -                                  goto repeat;
     -                          }
     -                          error = do_sysctl_strategy(table, name, nlen,
     -                                                     oldval, oldlenp,
     -                                                     newval, newlen);
     -                          return error;
     -                  }
     -          }
     -          return -ENOTDIR;
     -      }
     -      
     -      /* Perform the actual read/write of a sysctl table entry. */
     -      int do_sysctl_strategy (struct ctl_table *table,
     -                          int __user *name, int nlen,
     -                          void __user *oldval, size_t __user *oldlenp,
     -                          void __user *newval, size_t newlen)
     -      {
     -          int op = 0, rc;
     -      
     -          if (oldval)
     -                  op |= 004;
     -          if (newval) 
     -                  op |= 002;
     -          if (sysctl_perm(table, op))
     -                  return -EPERM;
            
     -          if (table->strategy) {
     -                  rc = table->strategy(table, name, nlen, oldval, oldlenp,
     -                                       newval, newlen);
     -                  if (rc < 0)
     -                          return rc;
     -                  if (rc > 0)
     -                          return 0;
     -          }
     +          if (root->permissions)
     +                  mode = root->permissions(root, current->nsproxy, table);
     +          else
     +                  mode = table->mode;
            
     -          /* If there is no strategy routine, or if the strategy returns
     -           * zero, proceed with automatic r/w */
     -          if (table->data && table->maxlen) {
     -                  rc = sysctl_data(table, name, nlen, oldval, oldlenp,
     -                                   newval, newlen);
     -                  if (rc < 0)
     -                          return rc;
     -          }
     -          return 0;
     +          return test_perm(mode, op);
            }
     -      #endif /* CONFIG_SYSCTL_SYSCALL */
            
            static void sysctl_set_parent(struct ctl_table *parent, struct ctl_table *table)
            {
@@@@@@@@@@@@@ -1598,13 -1595,13 -1583,13 -1598,13 -1598,13 -1594,9 -1598,13 -1598,13 -1598,13 -1598,13 -1595,13 -1598,13 +1586,13 @@@@@@@@@@@@@
            
            static __init int sysctl_init(void)
            {
     -          int err;
                sysctl_set_parent(NULL, root_table);
     -          err = sysctl_check_table(current->nsproxy, root_table);
     +      #ifdef CONFIG_SYSCTL_SYSCALL_CHECK
     +          {
     +                  int err;
     +                  err = sysctl_check_table(current->nsproxy, root_table);
     +          }
     +      #endif
                return 0;
            }
            
@@@@@@@@@@@@@ -1731,12 -1728,12 -1716,12 -1731,12 -1731,12 -1723,10 -1731,12 -1731,12 -1731,12 -1731,12 -1728,12 -1731,12 +1719,12 @@@@@@@@@@@@@ struct ctl_table_header *__register_sys
                header->unregistering = NULL;
                header->root = root;
                sysctl_set_parent(NULL, header->ctl_table);
     +      #ifdef CONFIG_SYSCTL_SYSCALL_CHECK
                if (sysctl_check_table(namespaces, header->ctl_table)) {
                        kfree(header);
                        return NULL;
                }
     +      #endif
                spin_lock(&sysctl_lock);
                header_list = lookup_header_list(root, namespaces);
                list_add_tail(&header->ctl_entry, header_list);