diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
commit | 5aa37e4f0614e3b1f385426ce1e962e84c275bdf (patch) | |
tree | 3d8c30207989d09fde8ffb2c3c44c6b923d70062 /include/asm-sparc64/ide.h | |
parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
parent | b76d69ed721e8365739c3bd5dd7891efbea88494 (diff) | |
download | linux-5aa37e4f0614e3b1f385426ce1e962e84c275bdf.tar.xz |
Merge branch 'x86/core' into x86/apic
Diffstat (limited to 'include/asm-sparc64/ide.h')
-rw-r--r-- | include/asm-sparc64/ide.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h deleted file mode 100644 index 7125317a428d..000000000000 --- a/include/asm-sparc64/ide.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-sparc/ide.h> |