diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /arch/arm/mach-realview/realview_eb.c | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
Diffstat (limited to 'arch/arm/mach-realview/realview_eb.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 5782d83fd886..19a9968fc5b9 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
| 25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
| 26 | 26 | ||
| 27 | #include <asm/hardware.h> | 27 | #include <mach/hardware.h> |
| 28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #include <asm/leds.h> | 30 | #include <asm/leds.h> |
| @@ -38,8 +38,8 @@ | |||
| 38 | #include <asm/mach/mmc.h> | 38 | #include <asm/mach/mmc.h> |
| 39 | #include <asm/mach/time.h> | 39 | #include <asm/mach/time.h> |
| 40 | 40 | ||
| 41 | #include <asm/arch/board-eb.h> | 41 | #include <mach/board-eb.h> |
| 42 | #include <asm/arch/irqs.h> | 42 | #include <mach/irqs.h> |
| 43 | 43 | ||
| 44 | #include "core.h" | 44 | #include "core.h" |
| 45 | #include "clock.h" | 45 | #include "clock.h" |