diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /arch/sparc/include/asm/jsflash.h | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| download | kernel-crypto-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.tar.gz kernel-crypto-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.tar.xz kernel-crypto-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/sparc/include/asm/jsflash.h')
| -rw-r--r-- | arch/sparc/include/asm/jsflash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/jsflash.h b/arch/sparc/include/asm/jsflash.h index 3457f29bd73..0717d9e39d2 100644 --- a/arch/sparc/include/asm/jsflash.h +++ b/arch/sparc/include/asm/jsflash.h @@ -8,7 +8,7 @@ #define _SPARC_JSFLASH_H #ifndef _SPARC_TYPES_H -#include <asm/types.h> +#include <linux/types.h> #endif /* |