diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 07:16:02 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 07:16:02 +0100 |
commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/sh/drivers | |
parent | sh: Ensure all PG_dcache_dirty pages are written back. (diff) | |
parent | serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx. (diff) | |
download | linux-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.xz linux-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.zip |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r-- | arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c index 052b354236dc..7898f14d6641 100644 --- a/arch/sh/drivers/pci/fixups-rts7751r2d.c +++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c @@ -15,7 +15,7 @@ #include <mach/lboxre2.h> #include <mach/r2d.h> #include "pci-sh4.h" -#include <asm/machtypes.h> +#include <generated/machtypes.h> #define PCIMCR_MRSET_OFF 0xBFFFFFFF #define PCIMCR_RFSH_OFF 0xFFFFFFFB |