diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/mach-integrator | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 27db275b367c..769b0f10c834 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig | |||
| @@ -4,6 +4,7 @@ menu "Integrator Options" | |||
| 4 | 4 | ||
| 5 | config ARCH_INTEGRATOR_AP | 5 | config ARCH_INTEGRATOR_AP |
| 6 | bool "Support Integrator/AP and Integrator/PP2 platforms" | 6 | bool "Support Integrator/AP and Integrator/PP2 platforms" |
| 7 | select MIGHT_HAVE_PCI | ||
| 7 | help | 8 | help |
| 8 | Include support for the ARM(R) Integrator/AP and | 9 | Include support for the ARM(R) Integrator/AP and |
| 9 | Integrator/PP2 platforms. | 10 | Integrator/PP2 platforms. |
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 8f4fb6d638f7..b8e884b450da 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
| @@ -21,9 +21,8 @@ | |||
| 21 | #include <linux/amba/bus.h> | 21 | #include <linux/amba/bus.h> |
| 22 | #include <linux/amba/serial.h> | 22 | #include <linux/amba/serial.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/clkdev.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/clkdev.h> | ||
| 26 | #include <mach/clkdev.h> | ||
| 27 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
| 28 | #include <mach/platform.h> | 27 | #include <mach/platform.h> |
| 29 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index fd684bf205e5..5db574f8ae3f 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
| @@ -22,9 +22,8 @@ | |||
| 22 | #include <linux/amba/clcd.h> | 22 | #include <linux/amba/clcd.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | #include <linux/clkdev.h> | ||
| 25 | 26 | ||
| 26 | #include <asm/clkdev.h> | ||
| 27 | #include <mach/clkdev.h> | ||
| 28 | #include <asm/hardware/icst.h> | 27 | #include <asm/hardware/icst.h> |
| 29 | #include <mach/lm.h> | 28 | #include <mach/lm.h> |
| 30 | #include <mach/impd1.h> | 29 | #include <mach/impd1.h> |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 1713ecf0c95f..85e48a5f77b9 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
| @@ -21,9 +21,8 @@ | |||
| 21 | #include <linux/amba/mmci.h> | 21 | #include <linux/amba/mmci.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/gfp.h> | 23 | #include <linux/gfp.h> |
| 24 | #include <linux/clkdev.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/clkdev.h> | ||
| 26 | #include <mach/clkdev.h> | ||
| 27 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
| 28 | #include <mach/platform.h> | 27 | #include <mach/platform.h> |
| 29 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |