diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /arch/sparc/include/asm/spitfire.h | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'arch/sparc/include/asm/spitfire.h')
| -rw-r--r-- | arch/sparc/include/asm/spitfire.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 985ea7e31992..f0d0c40c44da 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | #ifndef _SPARC64_SPITFIRE_H | 6 | #ifndef _SPARC64_SPITFIRE_H |
| 7 | #define _SPARC64_SPITFIRE_H | 7 | #define _SPARC64_SPITFIRE_H |
| 8 | 8 | ||
| 9 | #ifdef CONFIG_SPARC64 | ||
| 10 | |||
| 9 | #include <asm/asi.h> | 11 | #include <asm/asi.h> |
| 10 | 12 | ||
| 11 | /* The following register addresses are accessible via ASI_DMMU | 13 | /* The following register addresses are accessible via ASI_DMMU |
| @@ -338,5 +340,5 @@ static inline void cheetah_put_itlb_data(int entry, unsigned long data) | |||
| 338 | } | 340 | } |
| 339 | 341 | ||
| 340 | #endif /* !(__ASSEMBLY__) */ | 342 | #endif /* !(__ASSEMBLY__) */ |
| 341 | 343 | #endif /* CONFIG_SPARC64 */ | |
| 342 | #endif /* !(_SPARC64_SPITFIRE_H) */ | 344 | #endif /* !(_SPARC64_SPITFIRE_H) */ |