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

diff --cc 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
@@@@@@@@@@@@@ -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
@@@@@@@@@@@@@ -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,6 -308,6 -308,6 -308,6 -310,8 -310,7 -312,6 -313,6 -308,6 -308,6 -308,6 -308,6 +312,8 @@@@@@@@@@@@@ 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.
            
@@@@@@@@@@@@@ -371,10 -378,10 -378,10 -378,10 -382,10 -384,8 -382,10 -411,11 -378,10 -378,10 -378,10 -378,10 +412,11 @@@@@@@@@@@@@ config ARCH_ORION5
                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"
@@@@@@@@@@@@@ -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.
@@@@@@@@@@@@@ -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"
            

diff --cc 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
@@@@@@@@@@@@@ -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.

diff --cc arch/arm/configs/at91cap9adk_defconfig
Simple merge

diff --cc 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
@@@@@@@@@@@@@ -245,8 -245,8 -245,7 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -245,8 -286,9 +286,8 @@@@@@@@@@@@@ CONFIG_ISA=
            #
            # 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

diff --cc 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
@@@@@@@@@@@@@ -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 @@@@@@@@@@@@@ config CPU_ARM925
            # 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
@@@@@@@@@@@@@ -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 @@@@@@@@@@@@@ config CPU_XSC
            # 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"
@@@@@@@@@@@@@ -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 --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc 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
@@@@@@@@@@@@@ -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 --cc drivers/rtc/rtc-sa1100.c
Simple merge

diff --cc include/asm-arm/cacheflush.h
Simple merge

diff --cc kernel/sysctl.c
Simple merge