diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-17 04:34:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-17 04:34:26 -0500 |
| commit | c0caac93f873cd3402b63246bf94d904afc4f5fd (patch) | |
| tree | a3a6f5dc5172bda471dd5f2392e8e83c2d5283fb /arch/arm | |
| parent | a7a5ac58df0832daf7774b083c33032a7d26c792 (diff) | |
| parent | 75e874c698bf7aeed005acd74d0fb13c47124939 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/devices.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index e6d8e10ae5d1..8a0837ea0294 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -110,6 +110,8 @@ config MACH_CM_X300 | |||
| 110 | bool "CompuLab CM-X300 modules" | 110 | bool "CompuLab CM-X300 modules" |
| 111 | select PXA3xx | 111 | select PXA3xx |
| 112 | select CPU_PXA300 | 112 | select CPU_PXA300 |
| 113 | select CPU_PXA310 | ||
| 114 | select HAVE_PWM | ||
| 113 | 115 | ||
| 114 | config ARCH_GUMSTIX | 116 | config ARCH_GUMSTIX |
| 115 | bool "Gumstix XScale 255 boards" | 117 | bool "Gumstix XScale 255 boards" |
| @@ -240,7 +242,6 @@ config MACH_COLIBRI300 | |||
| 240 | select PXA3xx | 242 | select PXA3xx |
| 241 | select CPU_PXA300 | 243 | select CPU_PXA300 |
| 242 | select CPU_PXA310 | 244 | select CPU_PXA310 |
| 243 | select HAVE_PWM | ||
| 244 | 245 | ||
| 245 | config MACH_COLIBRI320 | 246 | config MACH_COLIBRI320 |
| 246 | bool "Toradex Colibri PXA320" | 247 | bool "Toradex Colibri PXA320" |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 3395463bb5a6..8e10db148f1b 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/platform_device.h> | 4 | #include <linux/platform_device.h> |
| 5 | #include <linux/dma-mapping.h> | 5 | #include <linux/dma-mapping.h> |
| 6 | 6 | ||
| 7 | #include <mach/hardware.h> | ||
| 8 | #include <mach/udc.h> | 7 | #include <mach/udc.h> |
| 9 | #include <mach/pxafb.h> | 8 | #include <mach/pxafb.h> |
| 10 | #include <mach/mmc.h> | 9 | #include <mach/mmc.h> |
| @@ -14,6 +13,7 @@ | |||
| 14 | #include <mach/pxa2xx_spi.h> | 13 | #include <mach/pxa2xx_spi.h> |
| 15 | #include <mach/camera.h> | 14 | #include <mach/camera.h> |
| 16 | #include <mach/audio.h> | 15 | #include <mach/audio.h> |
| 16 | #include <mach/hardware.h> | ||
| 17 | #include <plat/i2c.h> | 17 | #include <plat/i2c.h> |
| 18 | #include <plat/pxa3xx_nand.h> | 18 | #include <plat/pxa3xx_nand.h> |
| 19 | 19 | ||