diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 08:37:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-06 08:37:39 -0700 |
commit | bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079 (patch) | |
tree | 578a2c07181a1832eea2dd4195b6ff2fcebf4c83 /arch/sh/drivers/pci/pci-sh7751.c | |
parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
parent | 8bed90557d2600d25e58de30df48b244980164ec (diff) | |
download | op-kernel-dev-bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079.zip op-kernel-dev-bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079.tar.gz |
Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: fix a number of Oopses and leaks in SH framebuffer driver
SH: fix error paths in DMA driver
sh: sh7751 pci controller io port fix
sh: Fix maximum number of SCIF ports in R2D defconfigs
SH: fix TS field shift calculation for DMA drivers
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 17811e5..f98141b 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c @@ -17,6 +17,7 @@ #include <linux/io.h> #include "pci-sh4.h" #include <asm/addrspace.h> +#include <asm/sizes.h> static int __init __area_sdram_check(struct pci_channel *chan, unsigned int area) @@ -47,8 +48,8 @@ static int __init __area_sdram_check(struct pci_channel *chan, static struct resource sh7751_pci_resources[] = { { .name = "SH7751_IO", - .start = SH7751_PCI_IO_BASE, - .end = SH7751_PCI_IO_BASE + SH7751_PCI_IO_SIZE - 1, + .start = 0x1000, + .end = SZ_4M - 1, .flags = IORESOURCE_IO }, { .name = "SH7751_mem", |