diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 17:55:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 17:55:09 -0400 |
| commit | b5684b83b1e1579bbbc80e703e990c0cccf5892c (patch) | |
| tree | 3f1b62b2320bce4d658d2ad0d4b77856499ac533 /include/asm-h8300 | |
| parent | 1481b9109fe771ec8b035d7760f42e36d2bed5d4 (diff) | |
| parent | 1b8ebad87b459e2e1333fbf28005977245ff5402 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (76 commits)
ide: use proper printk() KERN_* levels in ide-probe.c
ide: fix for EATA SCSI HBA in ATA emulating mode
ide: remove stale comments from drivers/ide/Makefile
ide: enable local IRQs in all handlers for TASKFILE_NO_DATA data phase
ide-scsi: remove kmalloced struct request
ht6560b: remove old history
ht6560b: update email address
ide-cd: fix oops when using growisofs
gayle: release resources on ide_host_add() failure
palm_bk3710: add UltraDMA/100 support
ide: trivial sparse annotations
ide: ide-tape.c sparse annotations and unaligned access removal
ide: drop 'name' parameter from ->init_chipset method
ide: prefix messages from IDE PCI host drivers by driver name
it821x: remove DECLARE_ITE_DEV() macro
it8213: remove DECLARE_ITE_DEV() macro
ide: include PCI device name in messages from IDE PCI host drivers
ide: remove <asm/ide.h> for some archs
ide-generic: remove ide_default_{io_base,irq}() inlines (take 3)
ide-generic: is no longer needed on ppc32
...
Diffstat (limited to 'include/asm-h8300')
| -rw-r--r-- | include/asm-h8300/ide.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/asm-h8300/ide.h b/include/asm-h8300/ide.h deleted file mode 100644 index f8535ce7476e..000000000000 --- a/include/asm-h8300/ide.h +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | /****************************************************************************/ | ||
| 2 | |||
| 3 | /* | ||
| 4 | * linux/include/asm-h8300/ide.h | ||
| 5 | * | ||
| 6 | * Copyright (C) 1994-1996 Linus Torvalds & authors | ||
| 7 | * Copyright (C) 2001 Lineo Inc., davidm@snapgear.com | ||
| 8 | * Copyright (C) 2002 Greg Ungerer (gerg@snapgear.com) | ||
| 9 | * Copyright (C) 2002 Yoshinori Sato (ysato@users.sourceforge.jp) | ||
| 10 | */ | ||
| 11 | |||
| 12 | /****************************************************************************/ | ||
| 13 | #ifndef _H8300_IDE_H | ||
| 14 | #define _H8300_IDE_H | ||
| 15 | /****************************************************************************/ | ||
| 16 | #ifdef __KERNEL__ | ||
| 17 | /****************************************************************************/ | ||
| 18 | |||
| 19 | #define MAX_HWIFS 1 | ||
| 20 | |||
| 21 | #include <asm-generic/ide_iops.h> | ||
| 22 | |||
| 23 | /****************************************************************************/ | ||
| 24 | #endif /* __KERNEL__ */ | ||
| 25 | #endif /* _H8300_IDE_H */ | ||
| 26 | /****************************************************************************/ | ||