Fix AT91RM9200 build breakage

The at91_cf driver got out of sync with certain changes in the PCMCIA
layer, notably getting rid of some duplication of data ... causing the
version merged to kernel.org to fail compiling.

This patch gives the at91_cf platform device a new iomem resource, using
it so this new pcmcia scheme works.  It also cleans up some whitepsace
bugs that have accumulated over time (mostly too-long lines).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 11 insertions, 1 deletions

diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c
index 1781b8f342c4..bfe47bd6e50c 100644
--- a/arch/arm/mach-at91rm9200/devices.c
+++ b/arch/arm/mach-at91rm9200/devices.c
@@ -194,13 +194,23 @@ void __init at91_add_device_eth(struct at91_eth_data *data) {}
 #if defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)
 static struct at91_cf_data cf_data;
 
+static struct resource at91_cf_resources[] = {
+        [0] = {
+                .start  = AT91_CF_BASE,
+                /* ties up CS4, CS5, and CS6 */
+                .end    = AT91_CF_BASE + (0x30000000 - 1),
+                .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,
+        },
+};
+
 static struct platform_device at91rm9200_cf_device = {
         .name           = "at91_cf",
         .id             = -1,
         .dev            = {
                                 .platform_data          = &cf_data,
         },
-        .num_resources  = 0,
+        .resource       = at91_cf_resources,
+        .num_resources  = ARRAY_SIZE(at91_cf_resources),
 };
 
 void __init at91_add_device_cf(struct at91_cf_data *data)