git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
drivers
/
message
/
i2o
/
i2o_scsi.c
diff --git
a/drivers/message/i2o/i2o_scsi.c
b/drivers/message/i2o/i2o_scsi.c
index
74fbe56
..
c8ed7b6
100644
(file)
--- a/
drivers/message/i2o/i2o_scsi.c
+++ b/
drivers/message/i2o/i2o_scsi.c
@@
-59,7
+59,7
@@
#include <asm/dma.h>
#include <asm/system.h>
#include <asm/io.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>