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 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
drivers
/
scsi
/
megaraid.h
diff --git
a/drivers/scsi/megaraid.h
b/drivers/scsi/megaraid.h
index
66529f1
..
c6e7464
100644
(file)
--- a/
drivers/scsi/megaraid.h
+++ b/
drivers/scsi/megaraid.h
@@
-801,7
+801,8
@@
typedef struct {
clustering is available */
u32 flag;
- unsigned long base;
+ unsigned long base;
+ void __iomem *mmio_base;
/* mbox64 with mbox not aligned on 16-byte boundry */
mbox64_t *una_mbox64;