diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 14:49:27 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 14:49:27 +0400 |
| commit | 1389ac4b976abdc0555280dfc1aa2c3abcc19641 (patch) | |
| tree | 1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539 /arch/mips/include/asm/ide.h | |
| parent | 69e13ad56f9e2cd81c4f8bfd6267211c10c14c08 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
| download | linux-1389ac4b976abdc0555280dfc1aa2c3abcc19641.tar.xz | |
Merge branch 'linus' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'arch/mips/include/asm/ide.h')
| -rw-r--r-- | arch/mips/include/asm/ide.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/include/asm/ide.h b/arch/mips/include/asm/ide.h new file mode 100644 index 000000000000..bb674c3b0303 --- /dev/null +++ b/arch/mips/include/asm/ide.h @@ -0,0 +1,13 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * This file contains the MIPS architecture specific IDE code. + */ +#ifndef __ASM_IDE_H +#define __ASM_IDE_H + +#include <ide.h> + +#endif /* __ASM_IDE_H */ |