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-vexpress/v2m.c | |
| 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-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index de13603dc028..a9ed3428a2fa 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 12 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
| 13 | #include <linux/usb/isp1760.h> | 13 | #include <linux/usb/isp1760.h> |
| 14 | #include <linux/clkdev.h> | ||
| 14 | 15 | ||
| 15 | #include <asm/clkdev.h> | ||
| 16 | #include <asm/sizes.h> | 16 | #include <asm/sizes.h> |
| 17 | #include <asm/mach/flash.h> | 17 | #include <asm/mach/flash.h> |
| 18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <asm/hardware/arm_timer.h> | 20 | #include <asm/hardware/arm_timer.h> |
| 21 | #include <asm/hardware/timer-sp.h> | 21 | #include <asm/hardware/timer-sp.h> |
| 22 | 22 | ||
| 23 | #include <mach/clkdev.h> | ||
| 24 | #include <mach/motherboard.h> | 23 | #include <mach/motherboard.h> |
| 25 | 24 | ||
| 26 | #include <plat/sched_clock.h> | 25 | #include <plat/sched_clock.h> |