diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /arch/sh/drivers/pci/pci-sh7751.c | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh7751.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7751.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index 17811e5d287b..f98141b3b7d7 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include "pci-sh4.h" | 18 | #include "pci-sh4.h" |
| 19 | #include <asm/addrspace.h> | 19 | #include <asm/addrspace.h> |
| 20 | #include <asm/sizes.h> | ||
| 20 | 21 | ||
| 21 | static int __init __area_sdram_check(struct pci_channel *chan, | 22 | static int __init __area_sdram_check(struct pci_channel *chan, |
| 22 | unsigned int area) | 23 | unsigned int area) |
| @@ -47,8 +48,8 @@ static int __init __area_sdram_check(struct pci_channel *chan, | |||
| 47 | static struct resource sh7751_pci_resources[] = { | 48 | static struct resource sh7751_pci_resources[] = { |
| 48 | { | 49 | { |
| 49 | .name = "SH7751_IO", | 50 | .name = "SH7751_IO", |
| 50 | .start = SH7751_PCI_IO_BASE, | 51 | .start = 0x1000, |
| 51 | .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1, | 52 | .end = SZ_4M - 1, |
| 52 | .flags = IORESOURCE_IO | 53 | .flags = IORESOURCE_IO |
| 53 | }, { | 54 | }, { |
| 54 | .name = "SH7751_mem", | 55 | .name = "SH7751_mem", |