diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-06 10:01:18 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-06 10:01:18 -0500 |
| commit | 4796b71fbb907ce6b8a9acf1852d3646a80b4576 (patch) | |
| tree | 6263f165446c581efdbb760205c1f85378fe6259 /drivers/scsi/megaraid.h | |
| parent | 6d5aefb8eaa38e44b5b8cf60c812aceafc02d924 (diff) | |
| parent | ec0bf39a471bf6fcd01def2bd677128cea940b73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pcmcia/ds.c
Fix up merge failures with Linus's head and fix new compile failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/scsi/megaraid.h')
| -rw-r--r-- | drivers/scsi/megaraid.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 66529f11d23c..c6e74643abe2 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
| @@ -801,7 +801,8 @@ typedef struct { | |||
| 801 | clustering is available */ | 801 | clustering is available */ |
| 802 | u32 flag; | 802 | u32 flag; |
| 803 | 803 | ||
| 804 | unsigned long base; | 804 | unsigned long base; |
| 805 | void __iomem *mmio_base; | ||
| 805 | 806 | ||
| 806 | /* mbox64 with mbox not aligned on 16-byte boundry */ | 807 | /* mbox64 with mbox not aligned on 16-byte boundry */ |
| 807 | mbox64_t *una_mbox64; | 808 | mbox64_t *una_mbox64; |