diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 15:38:48 +0200 |
| commit | bda307ed7bdc160fcf1475a49f6c2e796fcb1294 (patch) | |
| tree | aa24926a83001373cb4ac2d8be9fd1b6994e7c60 /include/asm-m68k/ide.h | |
| parent | x86: fix up a comment in ack_APIC_irq() (diff) | |
| parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
| download | linux-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.tar.xz linux-bda307ed7bdc160fcf1475a49f6c2e796fcb1294.zip | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/asm-m68k/ide.h')
| -rw-r--r-- | include/asm-m68k/ide.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 909c6dfd3851..1daf6cbdd9f0 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h @@ -45,10 +45,6 @@ #include <asm/macints.h> #endif -#ifndef MAX_HWIFS -#define MAX_HWIFS 4 /* same as the other archs */ -#endif - /* * Get rid of defs from io.h - ide has its private and conflicting versions * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we |