diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /arch/arm/plat-omap/devices.c | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 81002b722da..187e3d8bfdf 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -14,17 +14,17 @@ #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/mach/map.h> -#include <asm/arch/tc.h> -#include <asm/arch/board.h> -#include <asm/arch/mux.h> -#include <asm/arch/gpio.h> -#include <asm/arch/menelaus.h> -#include <asm/arch/mcbsp.h> +#include <mach/tc.h> +#include <mach/board.h> +#include <mach/mux.h> +#include <mach/gpio.h> +#include <mach/menelaus.h> +#include <mach/mcbsp.h> #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) |