diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap1/board-generic.c | |
| parent | Linux 2.6.32-rc6 (diff) | |
| parent | omap: headers: Move remaining headers from include/mach to include/plat (diff) | |
| download | linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 6c8a41f20e51..e1195a3467b8 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -23,10 +23,10 @@ #include <asm/mach/map.h> #include <mach/gpio.h> -#include <mach/mux.h> -#include <mach/usb.h> -#include <mach/board.h> -#include <mach/common.h> +#include <plat/mux.h> +#include <plat/usb.h> +#include <plat/board.h> +#include <plat/common.h> static void __init omap_generic_init_irq(void) { |