Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt
  [ARM] Update mach-types
  [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation
  [ARM] 3654/1: add ajeco 1arm sbc support
  [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug
  [ARM] 3651/1: S3C24XX: Make arch list more detailed
  [ARM] 3650/1: S3C2412: Update s3c2410_defconfig
  [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440
  [ARM] 3612/1: make pci bus optional for ixp4xx platform
  [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
  [ARM] Remove save_lr/restore_pc macros
  [ARM] Remove partial non-v6 binutils compatibility
  [ARM] Remove LOADREGS macro
  [ARM] Remove RETINSTR macro

2 files changed, 17 insertions, 10 deletions

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 3b23f43cb160..57f23b465392 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -35,7 +35,6 @@ config ARCH_ADI_COYOTE
 
 config ARCH_IXDP425
         bool "IXDP425"
-        select PCI
         help
           Say 'Y' here if you want your kernel to support Intel's 
           IXDP425 Development Platform (Also known as Richfield).  
@@ -43,7 +42,6 @@ config ARCH_IXDP425
 
 config MACH_IXDPG425
         bool "IXDPG425"
-        select PCI
         help
           Say 'Y' here if you want your kernel to support Intel's
           IXDPG425 Development Platform (Also known as Montajade).
@@ -51,7 +49,6 @@ config MACH_IXDPG425
 
 config MACH_IXDP465
         bool "IXDP465"
-        select PCI
         help
           Say 'Y' here if you want your kernel to support Intel's
           IXDP465 Development Platform (Also known as BMP).
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index 5a4aaa0e0a09..640315d8b96a 100644
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -2,13 +2,23 @@
 # Makefile for the linux kernel.
 #
 
+obj-pci-y       :=
+obj-pci-n       :=
+
+obj-pci-$(CONFIG_ARCH_IXDP4XX)          += ixdp425-pci.o
+obj-pci-$(CONFIG_MACH_IXDPG425)         += ixdpg425-pci.o
+obj-pci-$(CONFIG_ARCH_ADI_COYOTE)       += coyote-pci.o
+obj-pci-$(CONFIG_MACH_GTWX5715)         += gtwx5715-pci.o
+obj-pci-$(CONFIG_MACH_NSLU2)            += nslu2-pci.o
+obj-pci-$(CONFIG_MACH_NAS100D)          += nas100d-pci.o
+
 obj-y   += common.o
 
-obj-$(CONFIG_PCI)               += common-pci.o
-obj-$(CONFIG_ARCH_IXDP4XX)      += ixdp425-pci.o ixdp425-setup.o
-obj-$(CONFIG_MACH_IXDPG425)     += ixdpg425-pci.o coyote-setup.o
-obj-$(CONFIG_ARCH_ADI_COYOTE)   += coyote-pci.o coyote-setup.o
-obj-$(CONFIG_MACH_GTWX5715)     += gtwx5715-pci.o gtwx5715-setup.o
-obj-$(CONFIG_MACH_NSLU2)        += nslu2-pci.o nslu2-setup.o nslu2-power.o
-obj-$(CONFIG_MACH_NAS100D)      += nas100d-pci.o nas100d-setup.o nas100d-power.o
+obj-$(CONFIG_ARCH_IXDP4XX)      += ixdp425-setup.o
+obj-$(CONFIG_MACH_IXDPG425)     += coyote-setup.o
+obj-$(CONFIG_ARCH_ADI_COYOTE)   += coyote-setup.o
+obj-$(CONFIG_MACH_GTWX5715)     += gtwx5715-setup.o
+obj-$(CONFIG_MACH_NSLU2)        += nslu2-setup.o nslu2-power.o
+obj-$(CONFIG_MACH_NAS100D)      += nas100d-setup.o nas100d-power.o
 
+obj-$(CONFIG_PCI)               += $(obj-pci-$(CONFIG_PCI)) common-pci.o