Merge linux-2.6 with linux-acpi-2.6

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 0e4f6fab100a..47cfb8bb8318 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -62,6 +62,15 @@ struct platform_device poodle_scoop_device = {
         .resource       = poodle_scoop_resources,
 };
 
+static struct scoop_pcmcia_dev poodle_pcmcia_scoop[] = {
+{
+        .dev        = &poodle_scoop_device.dev,
+        .irq        = POODLE_IRQ_GPIO_CF_IRQ,
+        .cd_irq     = POODLE_IRQ_GPIO_CF_CD,
+        .cd_irq_str = "PCMCIA0 CD",
+},
+};
+
 
 /* LoCoMo device */
 static struct resource locomo_resources[] = {
@@ -147,6 +156,9 @@ static void __init poodle_init(void)
 
         set_pxa_fb_info(&poodle_fb_info);
 
+        scoop_num = 1;
+        scoop_devs = &poodle_pcmcia_scoop[0];
+
         ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         if (ret) {
                 printk(KERN_WARNING "poodle: Unable to register LoCoMo device\n");