projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (Andrew's patch-bomb)
[cascardo/linux.git]
/
drivers
/
scsi
/
ultrastor.c
diff --git
a/drivers/scsi/ultrastor.c
b/drivers/scsi/ultrastor.c
index
7e22b73
..
14e0c40
100644
(file)
--- a/
drivers/scsi/ultrastor.c
+++ b/
drivers/scsi/ultrastor.c
@@
-141,7
+141,6
@@
#include <linux/delay.h>
#include <asm/io.h>
-#include <asm/system.h>
#include <asm/dma.h>
#define ULTRASTOR_PRIVATE /* Get the private stuff from ultrastor.h */