diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:50:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-23 07:50:00 -0700 |
commit | 2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29 (patch) | |
tree | 62a49268a6baa58b25c76e5deae21f9b49bcc626 /include/asm-sh/landisk/ide.h | |
parent | 5cfc35cf79d46af998346e3d5cc66fa344d1af0e (diff) | |
parent | 66a740572d7bcb18469e71cb014bfed3ff75a773 (diff) | |
download | kernel_samsung_smdk4412-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.tar.gz kernel_samsung_smdk4412-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.tar.bz2 kernel_samsung_smdk4412-2e11665c5ea436e2fc2cfecbfc6dbfb8d420af29.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Convert INTC2 to IRQ table registration.
sh: Updates for irq-flow-type naming changes.
sh: Add some missing board headers.
sh: Fix exception_handling_table alignment.
sh: Cleanup board header directories.
sh: Remove board-specific ide.h headers.
sh: Proper show_stack/show_trace() implementation.
Diffstat (limited to 'include/asm-sh/landisk/ide.h')
-rw-r--r-- | include/asm-sh/landisk/ide.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-sh/landisk/ide.h b/include/asm-sh/landisk/ide.h deleted file mode 100644 index 6490e28415e..00000000000 --- a/include/asm-sh/landisk/ide.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * modifed by kogiidena - * 2005.03.03 - */ - -#ifndef __ASM_SH_LANDISK_IDE_H -#define __ASM_SH_LANDISK_IDE_H - -/* Nothing to see here.. */ -#include <asm/landisk/iodata_landisk.h> -#define IRQ_CFCARD IRQ_FATA /* CF Card IRQ */ -#define IRQ_PCMCIA IRQ_ATA /* PCMCIA IRQ */ - -#endif /* __ASM_SH_LANDISK_IDE_H */ |