aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000/common/platform.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-19 03:37:31 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-19 03:37:31 -0400
commitd819c49da624e3ee09b2844603d58265039eecdd (patch)
tree09a503b98769767d81337ec8e5c14c60874a4e77 /arch/mips/au1000/common/platform.c
parentf18f982abf183e91f435990d337164c7a43d1e6d (diff)
parent9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/mips/au1000/common/platform.c')
-rw-r--r--arch/mips/au1000/common/platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 8cae7753ef79..74d6d4a593be 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = {
165static struct resource au1xxx_mmc_resources[] = { 165static struct resource au1xxx_mmc_resources[] = {
166 [0] = { 166 [0] = {
167 .start = SD0_PHYS_ADDR, 167 .start = SD0_PHYS_ADDR,
168 .end = SD0_PHYS_ADDR + 0x40, 168 .end = SD0_PHYS_ADDR + 0x7ffff,
169 .flags = IORESOURCE_MEM, 169 .flags = IORESOURCE_MEM,
170 }, 170 },
171 [1] = { 171 [1] = {
172 .start = SD1_PHYS_ADDR, 172 .start = SD1_PHYS_ADDR,
173 .end = SD1_PHYS_ADDR + 0x40, 173 .end = SD1_PHYS_ADDR + 0x7ffff,
174 .flags = IORESOURCE_MEM, 174 .flags = IORESOURCE_MEM,
175 }, 175 },
176 [2] = { 176 [2] = {