diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /include/asm-sparc/sbus.h | |
| parent | 05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'include/asm-sparc/sbus.h')
| -rw-r--r-- | include/asm-sparc/sbus.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-sparc/sbus.h b/include/asm-sparc/sbus.h deleted file mode 100644 index 8f29a197966..00000000000 --- a/include/asm-sparc/sbus.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef ___ASM_SPARC_SBUS_H -#define ___ASM_SPARC_SBUS_H -#if defined(__sparc__) && defined(__arch64__) -#include <asm-sparc/sbus_64.h> -#else -#include <asm-sparc/sbus_32.h> -#endif -#endif |