diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:34:22 +0200 |
commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /include/asm-sparc/pci.h | |
parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
download | kernel-crypto-6679ce6e5f519096612b480d255d9ca97be0c2be.tar.gz kernel-crypto-6679ce6e5f519096612b480d255d9ca97be0c2be.tar.xz kernel-crypto-6679ce6e5f519096612b480d255d9ca97be0c2be.zip |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/asm-sparc/pci.h')
-rw-r--r-- | include/asm-sparc/pci.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h deleted file mode 100644 index b807d52a480..00000000000 --- a/include/asm-sparc/pci.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef ___ASM_SPARC_PCI_H -#define ___ASM_SPARC_PCI_H -#if defined(__sparc__) && defined(__arch64__) -#include <asm-sparc/pci_64.h> -#else -#include <asm-sparc/pci_32.h> -#endif -#endif |