diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/a100u2w.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/a100u2w.c')
-rw-r--r-- | drivers/scsi/a100u2w.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index 208d6df9ed59..dbbc601948e5 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
@@ -69,7 +69,6 @@ | |||
69 | #include <linux/kernel.h> | 69 | #include <linux/kernel.h> |
70 | #include <linux/string.h> | 70 | #include <linux/string.h> |
71 | #include <linux/ioport.h> | 71 | #include <linux/ioport.h> |
72 | #include <linux/slab.h> | ||
73 | #include <linux/dma-mapping.h> | 72 | #include <linux/dma-mapping.h> |
74 | 73 | ||
75 | #include <asm/io.h> | 74 | #include <asm/io.h> |
@@ -492,7 +491,7 @@ static void init_alloc_map(struct orc_host * host) | |||
492 | * init_orchid - initialise the host adapter | 491 | * init_orchid - initialise the host adapter |
493 | * @host:host adapter to initialise | 492 | * @host:host adapter to initialise |
494 | * | 493 | * |
495 | * Initialise the controller and if neccessary load the firmware. | 494 | * Initialise the controller and if necessary load the firmware. |
496 | * | 495 | * |
497 | * Returns -1 if the initialisation fails. | 496 | * Returns -1 if the initialisation fails. |
498 | */ | 497 | */ |