diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:30 -0800 |
commit | 3995f4c5327595b51482bdac8c189736262eb6e0 (patch) | |
tree | ef768d0ecf243a2376bfc646b847964313146d3e /drivers/scsi | |
parent | 05814450070f13b671fc9dbf89477677aa0258cb (diff) | |
parent | fe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff) | |
download | op-kernel-dev-3995f4c5327595b51482bdac8c189736262eb6e0.zip op-kernel-dev-3995f4c5327595b51482bdac8c189736262eb6e0.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/arm/acornscsi.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/arxescsi.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_1.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/cumana_2.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/eesox.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/powertec.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 09ed057..dda5a5f 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -146,7 +146,6 @@ #include <asm/system.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/ecard.h> #include "../scsi.h" diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c index 804125e..a289401 100644 --- a/drivers/scsi/arm/arxescsi.c +++ b/drivers/scsi/arm/arxescsi.c @@ -33,7 +33,6 @@ #include <asm/dma.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/ecard.h> #include "../scsi.h" diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index 81e266b..e6c9491 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c @@ -13,7 +13,6 @@ #include <asm/ecard.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/system.h> #include "../scsi.h" diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 3a7a46b..583d2d8 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c @@ -31,7 +31,6 @@ #include <asm/dma.h> #include <asm/ecard.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/pgtable.h> #include "../scsi.h" diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index 4d1e8f5..3ffec7e 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -35,7 +35,6 @@ #include <linux/dma-mapping.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/dma.h> #include <asm/ecard.h> #include <asm/pgtable.h> diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 3333d7b..3113bdc 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -22,7 +22,6 @@ #include <asm/dma.h> #include <asm/ecard.h> #include <asm/io.h> -#include <asm/irq.h> #include <asm/pgtable.h> #include "../scsi.h" |