diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 11:39:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 11:39:33 -0700 |
commit | 35ad1c8803921b28541ad28bfb18dc3b6295ba98 (patch) | |
tree | 998468e8bd42fab02d09bae8fc74bdf546608580 /arch/sh/boards | |
parent | 580da34847488b404218d1d7f53b156f245f5555 (diff) | |
parent | f454cbe8cd38b6d447e74ddaf012017fea42717e (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:
ide: ->cable_detect method cannot be marked __devinit
ide: ->quirkproc method cannot be marked __devinit
cs5520: add enablebits checking
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
ide-cd: fix endianity for the error message in cdrom_read_capacity
ide: remove CONFIG_IDE_MAX_HWIFS
remove unneeded #include <linux/ide.h>'s
ide: fix regression caused by ide_device_{get,put}() addition (take 2)
remove unnecessary <linux/hdreg.h> includes
ide: sanitize struct ide_port_ops documentation (take 2)
ide: fix ide_fix_driveid()
ide: fix pre-EIDE SWDMA support on big-endian
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/mach-systemh/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c index 0ba2fe674c4..601c9c8cdbe 100644 --- a/arch/sh/boards/mach-systemh/irq.c +++ b/arch/sh/boards/mach-systemh/irq.c @@ -11,9 +11,8 @@ #include <linux/init.h> #include <linux/irq.h> +#include <linux/interrupt.h> -#include <linux/hdreg.h> -#include <linux/ide.h> #include <asm/io.h> #include <asm/systemh7751.h> #include <asm/smc37c93x.h> |