diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:02 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:02 +0900 |
commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/sh/include | |
parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
download | linux-3.10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.gz linux-3.10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.bz2 linux-3.10-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.zip |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/.gitignore | 1 | ||||
-rw-r--r-- | arch/sh/include/asm/asm-offsets.h | 1 | ||||
-rw-r--r-- | arch/sh/include/asm/machvec.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/.gitignore b/arch/sh/include/asm/.gitignore deleted file mode 100644 index 378db779fb6..00000000000 --- a/arch/sh/include/asm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -machtypes.h diff --git a/arch/sh/include/asm/asm-offsets.h b/arch/sh/include/asm/asm-offsets.h new file mode 100644 index 00000000000..d370ee36a18 --- /dev/null +++ b/arch/sh/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include <generated/asm-offsets.h> diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index 84dd37761f5..9c30955630f 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h @@ -12,7 +12,7 @@ #include <linux/types.h> #include <linux/time.h> -#include <asm/machtypes.h> +#include <generated/machtypes.h> struct sh_machine_vector { void (*mv_setup)(char **cmdline_p); |