Merge branch 'fb' into devel

Conflicts:

	arch/arm/Kconfig

diff --combined arch/arm/Kconfig
index b786e68914d4a20b12b743ee886b9acdbed623d7,ab78d5c421fd23a0fa6ba45d760a7b370d5bf2cf..9773a3f730f3fc8b9759bbb337570eba726c86de
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -8,7 -8,6 +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
@@@ -224,6 -223,7 +224,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,13 -232,6 +232,6 @@@ config ARCH_CLPS711
        help
          Support for Cirrus Logic 711x/721x based boards.
  
- config ARCH_CO285
-       bool "Co-EBSA285"
-       select FOOTBRIDGE
-       select FOOTBRIDGE_ADDIN
-       help
-         Support for Intel's EBSA285 companion chip.
- 
  config ARCH_EBSA110
        bool "EBSA-110"
        select ISA
@@@ -254,13 -247,13 +247,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.
@@@ -299,6 -292,7 +292,6 @@@ config ARCH_IOP32
        depends on MMU
        select PLAT_IOP
        select PCI
 -      select HAVE_IDE
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
@@@ -308,12 -302,14 +301,12 @@@ config ARCH_IOP33
        depends on MMU
        select PLAT_IOP
        select PCI
 -      select HAVE_IDE
        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.
@@@ -331,12 -327,14 +324,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.
@@@ -371,17 -369,15 +364,17 @@@ config ARCH_MX
        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.)
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
@@@ -393,6 -389,7 +386,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
@@@ -408,6 -405,7 +401,6 @@@ config ARCH_RP
        select ARCH_MAY_HAVE_PC_FDC
        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.
@@@ -416,20 -414,17 +409,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
@@@ -437,6 -432,7 +430,6 @@@
  
  config ARCH_SHARK
        bool "Shark"
 -      select HAVE_IDE
        select ISA
        select ISA_DMA
        select PCI
@@@ -446,6 -442,7 +439,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
@@@ -463,7 -460,6 +456,7 @@@ config ARCH_DAVINC
  config ARCH_OMAP
        bool "TI OMAP"
        select GENERIC_GPIO
 +      select HAVE_GPIO_LIB
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
@@@ -512,7 -508,7 +505,7 @@@ 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/plat-s3c24xx/Kconfig"
  source "arch/arm/plat-s3c/Kconfig"
@@@ -559,9 -555,6 +552,9 @@@ config ARCH_ACOR
  config PLAT_IOP
        bool
  
 +config PLAT_ORION
 +      bool
 +
  source arch/arm/mm/Kconfig
  
  config IWMMXT
@@@ -649,7 -642,7 +642,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
@@@ -682,7 -675,7 +675,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
@@@ -773,12 -766,6 +766,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
@@@ -789,7 -776,7 +782,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 || \
@@@ -1179,8 -1166,6 +1172,8 @@@ source "drivers/dma/Kconfig
  
  source "drivers/dca/Kconfig"
  
 +source "drivers/uio/Kconfig"
 +
  endmenu
  
  source "fs/Kconfig"

diff --combined arch/arm/Makefile
index e72db27e0ba074e599d9eda4101c417c19f78362,79b8ca3400e08d83879633d475d76547e64ae688..1c840639f8282782170e50bee9edcf6e22e807e0
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -100,8 -100,6 +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)
@@@ -134,11 -132,12 +132,11 @@@ 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_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
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
@@@ -184,7 -183,6 +182,7 @@@ 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/