diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 12:28:00 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 12:28:00 +0200 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /arch/arm/plat-omap/debug-devices.c | |
| parent | [MTD] [OneNAND] Add OMAP2 / OMAP3 OneNAND driver (diff) | |
| parent | Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd (diff) | |
| download | linux-742c52533b05d8ae83c794bd6811100675b85ce5.tar.xz linux-742c52533b05d8ae83c794bd6811100675b85ce5.zip | |
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/plat-omap/debug-devices.c')
| -rw-r--r-- | arch/arm/plat-omap/debug-devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c index f455233af082..5b73bb274452 100644 --- a/arch/arm/plat-omap/debug-devices.c +++ b/arch/arm/plat-omap/debug-devices.c @@ -13,11 +13,11 @@ #include <linux/init.h> #include <linux/platform_device.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/board.h> -#include <asm/arch/gpio.h> +#include <mach/board.h> +#include <mach/gpio.h> /* Many OMAP development platforms reuse the same "debug board"; these |