diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
| commit | 05cd2544f4b64d9a9eca0d170191867495e01feb (patch) | |
| tree | 10146fb79bba464bac6f620d03b8cd50285065b7 /arch/mips/pci/pci-emma2rh.c | |
| parent | 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a (diff) | |
| parent | a0601c8944dc08c2d349c24bd9c0b09c406229fc (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/mips/pci/pci-emma2rh.c')
| -rw-r--r-- | arch/mips/pci/pci-emma2rh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c index 772e283daa63..2df4190232cd 100644 --- a/arch/mips/pci/pci-emma2rh.c +++ b/arch/mips/pci/pci-emma2rh.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <asm/bootinfo.h> | 31 | #include <asm/bootinfo.h> |
| 32 | 32 | ||
| 33 | #include <asm/emma2rh/emma2rh.h> | 33 | #include <asm/emma/emma2rh.h> |
| 34 | 34 | ||
| 35 | static struct resource pci_io_resource = { | 35 | static struct resource pci_io_resource = { |
| 36 | .name = "pci IO space", | 36 | .name = "pci IO space", |