diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /drivers/message/fusion/mptbase.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'drivers/message/fusion/mptbase.c')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 610e914abe6c..85bc6a685e36 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -1587,7 +1587,7 @@ mpt_mapresources(MPT_ADAPTER *ioc) | |||
| 1587 | { | 1587 | { |
| 1588 | u8 __iomem *mem; | 1588 | u8 __iomem *mem; |
| 1589 | int ii; | 1589 | int ii; |
| 1590 | unsigned long mem_phys; | 1590 | resource_size_t mem_phys; |
| 1591 | unsigned long port; | 1591 | unsigned long port; |
| 1592 | u32 msize; | 1592 | u32 msize; |
| 1593 | u32 psize; | 1593 | u32 psize; |
| @@ -1677,8 +1677,8 @@ mpt_mapresources(MPT_ADAPTER *ioc) | |||
| 1677 | return -EINVAL; | 1677 | return -EINVAL; |
| 1678 | } | 1678 | } |
| 1679 | ioc->memmap = mem; | 1679 | ioc->memmap = mem; |
| 1680 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n", | 1680 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %llx\n", |
| 1681 | ioc->name, mem, mem_phys)); | 1681 | ioc->name, mem, (unsigned long long)mem_phys)); |
| 1682 | 1682 | ||
| 1683 | ioc->mem_phys = mem_phys; | 1683 | ioc->mem_phys = mem_phys; |
| 1684 | ioc->chip = (SYSIF_REGS __iomem *)mem; | 1684 | ioc->chip = (SYSIF_REGS __iomem *)mem; |