diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sh/boards/mach-highlander | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sh/boards/mach-highlander')
| -rw-r--r-- | arch/sh/boards/mach-highlander/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c index a5ecfbacaf36..87618c91d178 100644 --- a/arch/sh/boards/mach-highlander/setup.c +++ b/arch/sh/boards/mach-highlander/setup.c | |||
| @@ -24,10 +24,10 @@ | |||
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/usb/r8a66597.h> | 25 | #include <linux/usb/r8a66597.h> |
| 26 | #include <linux/usb/m66592.h> | 26 | #include <linux/usb/m66592.h> |
| 27 | #include <linux/clkdev.h> | ||
| 27 | #include <net/ax88796.h> | 28 | #include <net/ax88796.h> |
| 28 | #include <asm/machvec.h> | 29 | #include <asm/machvec.h> |
| 29 | #include <mach/highlander.h> | 30 | #include <mach/highlander.h> |
| 30 | #include <asm/clkdev.h> | ||
| 31 | #include <asm/clock.h> | 31 | #include <asm/clock.h> |
| 32 | #include <asm/heartbeat.h> | 32 | #include <asm/heartbeat.h> |
| 33 | #include <asm/io.h> | 33 | #include <asm/io.h> |