Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 31cf84d69026..931efd58f87a 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -309,9 +309,6 @@ static int __init misc_init(void)
 #ifdef CONFIG_BVME6000
         rtc_DP8570A_init();
 #endif
-#ifdef CONFIG_PMAC_PBOOK
-        pmu_device_init();
-#endif
         if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
                 printk("unable to get major %d for misc devices\n",
                        MISC_MAJOR);
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 1c8d866a49dc..8f36b1758eb6 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -581,7 +581,7 @@ static dev_link_t *mgslpc_attach(void)
 
     /* Interrupt setup */
     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
-    link->irq.IRQInfo1   = IRQ_INFO2_VALID | IRQ_LEVEL_ID;
+    link->irq.IRQInfo1   = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
     
     link->conf.Attributes = 0;
@@ -3081,6 +3081,12 @@ void mgslpc_remove_device(MGSLPC_INFO *remove_info)
         }
 }
 
+static struct pcmcia_device_id mgslpc_ids[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x02c5, 0x0050),
+        PCMCIA_DEVICE_NULL
+};
+MODULE_DEVICE_TABLE(pcmcia, mgslpc_ids);
+
 static struct pcmcia_driver mgslpc_driver = {
         .owner          = THIS_MODULE,
         .drv            = {
@@ -3088,6 +3094,7 @@ static struct pcmcia_driver mgslpc_driver = {
         },
         .attach         = mgslpc_attach,
         .detach         = mgslpc_detach,
+        .id_table       = mgslpc_ids,
 };
 
 static struct tty_operations mgslpc_ops = {