diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 18:46:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 18:46:37 -0500 |
| commit | c5ef91eee5015cc968996fb0d2974cbc41e4eccd (patch) | |
| tree | 9c8648ab4e6326e56e3fcbc6811baf998c963b5a /arch/sh/drivers/pci/ops-r7780rp.c | |
| parent | a6733f2e146a5f4884bc23023bf56f3a2698b547 (diff) | |
| parent | b0d98dc504c3f29cc4647fff87a5061be5f0f3d7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
sh: Support PCI IO access of SH7780 base boards.
sh: Fix PCI IO space base address of SH7780.
Diffstat (limited to 'arch/sh/drivers/pci/ops-r7780rp.c')
| -rw-r--r-- | arch/sh/drivers/pci/ops-r7780rp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c index f2216081ab85..48fe4032ebea 100644 --- a/arch/sh/drivers/pci/ops-r7780rp.c +++ b/arch/sh/drivers/pci/ops-r7780rp.c | |||
| @@ -40,8 +40,8 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin) | |||
| 40 | 40 | ||
| 41 | static struct resource sh7780_io_resource = { | 41 | static struct resource sh7780_io_resource = { |
| 42 | .name = "SH7780_IO", | 42 | .name = "SH7780_IO", |
| 43 | .start = 0x2000, | 43 | .start = SH7780_PCI_IO_BASE, |
| 44 | .end = 0x2000 + SH7780_PCI_IO_SIZE - 1, | 44 | .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1, |
| 45 | .flags = IORESOURCE_IO | 45 | .flags = IORESOURCE_IO |
| 46 | }; | 46 | }; |
| 47 | 47 | ||