diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /drivers/spi/omap_uwire.c | |
| parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/spi/omap_uwire.c')
| -rw-r--r-- | drivers/spi/omap_uwire.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index d9ae111c27ae..5515eb97d7c5 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c @@ -47,12 +47,12 @@ #include <asm/system.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/arch/mux.h> -#include <asm/arch/omap730.h> /* OMAP730_IO_CONF registers */ +#include <mach/mux.h> +#include <mach/omap730.h> /* OMAP730_IO_CONF registers */ /* FIXME address is now a platform device resource, |