diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/scsi/osst.c | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index de0b1a704fb5..21883a2d6324 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -54,7 +54,6 @@ static const char * osst_version = "0.99.4"; | |||
| 54 | #include <linux/mutex.h> | 54 | #include <linux/mutex.h> |
| 55 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
| 56 | #include <asm/dma.h> | 56 | #include <asm/dma.h> |
| 57 | #include <asm/system.h> | ||
| 58 | 57 | ||
| 59 | /* The driver prints some debugging information on the console if DEBUG | 58 | /* The driver prints some debugging information on the console if DEBUG |
| 60 | is defined and non-zero. */ | 59 | is defined and non-zero. */ |