HID: fix pb_fnmode and move it to generic HID

[linux-2.6-omap-h63xx.git] / drivers / macintosh / via-pmu68k.c

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 98ec915d0409689cb9ec3fb95c14a656fe13675c..93e6ef9233f9ec6bdb9632c06db15e301e666c9c 100644 (file)
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -221,7 +221,7 @@ pmu_init(void)
                }
                if (pmu_state == idle) {
                        adb_int_pending = 1;
-                       pmu_interrupt(0, NULL, NULL);
+                       pmu_interrupt(0, NULL);
                }
                pmu_poll();
                udelay(10);
@@ -562,11 +562,11 @@ pmu_poll(void)
        local_irq_save(flags);
        if (via1[IFR] & SR_INT) {
                via1[IFR] = SR_INT;
-               pmu_interrupt(IRQ_MAC_ADB_SR, NULL, NULL);
+               pmu_interrupt(IRQ_MAC_ADB_SR, NULL);
        }
        if (via1[IFR] & CB1_INT) {
                via1[IFR] = CB1_INT;
-               pmu_interrupt(IRQ_MAC_ADB_CL, NULL, NULL);
+               pmu_interrupt(IRQ_MAC_ADB_CL, NULL);
        }
        local_irq_restore(flags);
 }
@@ -847,7 +847,7 @@ pbook_pci_save(void)
        n_pbook_pci_saves = npci;
        if (npci == 0)
                return;
-       ps = (struct pci_save *) kmalloc(npci * sizeof(*ps), GFP_KERNEL);
+       ps = kmalloc(npci * sizeof(*ps), GFP_KERNEL);
        pbook_pci_saves = ps;
        if (ps == NULL)
                return;