Merge branch 'linus' into core/locking

384 files changed, 5081 insertions, 4081 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index d38f43f593d4..2f557f570ade 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/ssb/Kconfig"
 
 source "drivers/mfd/Kconfig"
 
+source "drivers/regulator/Kconfig"
+
 source "drivers/media/Kconfig"
 
 source "drivers/video/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 2503f7b99b2f..fceb71a741c3 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_MAC)		+= macintosh/
 obj-$(CONFIG_ATA_OVER_ETH)      += block/aoe/
 obj-$(CONFIG_PARIDE)            += block/paride/
 obj-$(CONFIG_TC)                += tc/
+obj-$(CONFIG_UWB)               += uwb/
 obj-$(CONFIG_USB)               += usb/
 obj-$(CONFIG_USB_MUSB_HDRC)     += usb/musb/
 obj-$(CONFIG_PCI)               += usb/
@@ -101,4 +102,3 @@ obj-$(CONFIG_SSB)		+= ssb/
 obj-$(CONFIG_VIRTIO)            += virtio/
 obj-$(CONFIG_REGULATOR)         += regulator/
 obj-$(CONFIG_STAGING)           += staging/
-obj-$(CONFIG_UWB)               += uwb/
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 9d568d417eaa..cb046c3fc3f2 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -262,6 +262,7 @@ static int acpi_lid_send_state(struct acpi_button *button)
                 return -ENODEV;
         /* input layer checks if event is redundant */
         input_report_switch(button->input, SW_LID, !state);
+        input_sync(button->input);
         return 0;
 }
 
@@ -285,8 +286,8 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
                         input_report_key(input, keycode, 1);
                         input_sync(input);
                         input_report_key(input, keycode, 0);
+                        input_sync(input);
                 }
-                input_sync(input);
 
                 acpi_bus_generate_proc_event(button->device, event,
                                         ++button->pushed);
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index dc98f7a6f2c4..dbcf260ea93f 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -38,7 +38,10 @@
 
 #include <asm/uaccess.h>
 #endif
+
+#ifdef CONFIG_X86
 #include <asm/cpufeature.h>
+#endif
 
 #include <acpi/acpi_bus.h>
 #include <acpi/processor.h>
@@ -360,11 +363,13 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
          * the BIOS is older than the CPU and does not know its frequencies
          */
  update_bios:
+#ifdef CONFIG_X86
         if (ACPI_SUCCESS(acpi_get_handle(pr->handle, "_PPC", &handle))){
                 if(boot_cpu_has(X86_FEATURE_EST))
                         printk(KERN_WARNING FW_BUG "BIOS needs update for CPU "
                                "frequency support\n");
         }
+#endif
         return result;
 }
 
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 26571bafb158..80c0868d0480 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -163,6 +163,8 @@ static void acpi_pm_end(void)
         acpi_target_sleep_state = ACPI_STATE_S0;
         acpi_sleep_tts_switch(acpi_target_sleep_state);
 }
+#else /* !CONFIG_ACPI_SLEEP */
+#define acpi_target_sleep_state ACPI_STATE_S0
 #endif /* CONFIG_ACPI_SLEEP */
 
 #ifdef CONFIG_SUSPEND
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 2a632f8b7a05..66aac06f2ac5 100644
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -371,6 +371,7 @@ static void bt_poll_rfkill(struct input_polled_dev *poll_dev)
                                    RFKILL_STATE_HARD_BLOCKED);
                 input_report_switch(poll_dev->input, SW_RFKILL_ALL,
                                     new_rfk_state);
+                input_sync(poll_dev->input);
         }
 }
 
@@ -842,6 +843,7 @@ static int __init toshiba_acpi_init(void)
         set_bit(EV_SW, toshiba_acpi.poll_dev->input->evbit);
         set_bit(SW_RFKILL_ALL, toshiba_acpi.poll_dev->input->swbit);
         input_report_switch(toshiba_acpi.poll_dev->input, SW_RFKILL_ALL, TRUE);
+        input_sync(toshiba_acpi.poll_dev->input);
 
         ret = input_register_polled_device(toshiba_acpi.poll_dev);
         if (ret) {
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index aeadd00411a1..a67b8e7c712d 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -49,6 +49,17 @@
 #define DRV_NAME        "ahci"
 #define DRV_VERSION     "3.0"
 
+/* Enclosure Management Control */
+#define EM_CTRL_MSG_TYPE              0x000f0000
+
+/* Enclosure Management LED Message Type */
+#define EM_MSG_LED_HBA_PORT           0x0000000f
+#define EM_MSG_LED_PMP_SLOT           0x0000ff00
+#define EM_MSG_LED_VALUE              0xffff0000
+#define EM_MSG_LED_VALUE_ACTIVITY     0x00070000
+#define EM_MSG_LED_VALUE_OFF          0xfff80000
+#define EM_MSG_LED_VALUE_ON           0x00010000
+
 static int ahci_skip_host_reset;
 module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);
 MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
@@ -588,6 +599,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
         { PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },        /* 6121 */
 
+        /* Promise */
+        { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },   /* PDC42819 */
+
         /* Generic, PCI class code for AHCI */
         { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
           PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -1220,18 +1234,20 @@ static void ahci_sw_activity_blink(unsigned long arg)
         struct ahci_em_priv *emp = &pp->em_priv[link->pmp];
         unsigned long led_message = emp->led_state;
         u32 activity_led_state;
+        unsigned long flags;
 
-        led_message &= 0xffff0000;
+        led_message &= EM_MSG_LED_VALUE;
         led_message |= ap->port_no | (link->pmp << 8);
 
         /* check to see if we've had activity.  If so,
          * toggle state of LED and reset timer.  If not,
          * turn LED to desired idle state.
          */
+        spin_lock_irqsave(ap->lock, flags);
         if (emp->saved_activity != emp->activity) {
                 emp->saved_activity = emp->activity;
                 /* get the current LED state */
-                activity_led_state = led_message & 0x00010000;
+                activity_led_state = led_message & EM_MSG_LED_VALUE_ON;
 
                 if (activity_led_state)
                         activity_led_state = 0;
@@ -1239,17 +1255,18 @@ static void ahci_sw_activity_blink(unsigned long arg)
                         activity_led_state = 1;
 
                 /* clear old state */
-                led_message &= 0xfff8ffff;
+                led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;
 
                 /* toggle state */
                 led_message |= (activity_led_state << 16);
                 mod_timer(&emp->timer, jiffies + msecs_to_jiffies(100));
         } else {
                 /* switch to idle */
-                led_message &= 0xfff8ffff;
+                led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;
                 if (emp->blink_policy == BLINK_OFF)
                         led_message |= (1 << 16);
         }
+        spin_unlock_irqrestore(ap->lock, flags);
         ahci_transmit_led_message(ap, led_message, 4);
 }
 
@@ -1294,7 +1311,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
         struct ahci_em_priv *emp;
 
         /* get the slot number from the message */
-        pmp = (state & 0x0000ff00) >> 8;
+        pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;
         if (pmp < MAX_SLOTS)
                 emp = &pp->em_priv[pmp];
         else
@@ -1319,7 +1336,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
         message[0] |= (4 << 8);
 
         /* ignore 0:4 of byte zero, fill in port info yourself */
-        message[1] = ((state & 0xfffffff0) | ap->port_no);
+        message[1] = ((state & ~EM_MSG_LED_HBA_PORT) | ap->port_no);
 
         /* write message to EM_LOC */
         writel(message[0], mmio + hpriv->em_loc);
@@ -1362,7 +1379,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
         state = simple_strtoul(buf, NULL, 0);
 
         /* get the slot number from the message */
-        pmp = (state & 0x0000ff00) >> 8;
+        pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;
         if (pmp < MAX_SLOTS)
                 emp = &pp->em_priv[pmp];
         else
@@ -1373,7 +1390,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
          * activity led through em_message
          */
         if (emp->blink_policy)
-                state &= 0xfff8ffff;
+                state &= ~EM_MSG_LED_VALUE_ACTIVITY;
 
         return ahci_transmit_led_message(ap, state, size);
 }
@@ -1392,16 +1409,16 @@ static ssize_t ahci_activity_store(struct ata_device *dev, enum sw_activity val)
                 link->flags &= ~(ATA_LFLAG_SW_ACTIVITY);
 
                 /* set the LED to OFF */
-                port_led_state &= 0xfff80000;
+                port_led_state &= EM_MSG_LED_VALUE_OFF;
                 port_led_state |= (ap->port_no | (link->pmp << 8));
                 ahci_transmit_led_message(ap, port_led_state, 4);
         } else {
                 link->flags |= ATA_LFLAG_SW_ACTIVITY;
                 if (val == BLINK_OFF) {
                         /* set LED to ON for idle */
-                        port_led_state &= 0xfff80000;
+                        port_led_state &= EM_MSG_LED_VALUE_OFF;
                         port_led_state |= (ap->port_no | (link->pmp << 8));
-                        port_led_state |= 0x00010000; /* check this */
+                        port_led_state |= EM_MSG_LED_VALUE_ON; /* check this */
                         ahci_transmit_led_message(ap, port_led_state, 4);
                 }
         }
@@ -2612,7 +2629,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 u32 em_loc = readl(mmio + HOST_EM_LOC);
                 u32 em_ctl = readl(mmio + HOST_EM_CTL);
 
-                messages = (em_ctl & 0x000f0000) >> 16;
+                messages = (em_ctl & EM_CTRL_MSG_TYPE) >> 16;
 
                 /* we only support LED message type right now */
                 if ((messages & 0x01) && (ahci_em_messages == 1)) {
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 75a406f5e694..5c33767e66de 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -1,6 +1,6 @@
 /*
  *  ata_generic.c - Generic PATA/SATA controller driver.
- *  Copyright 2005 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *  Copyright 2005 Red Hat Inc, all rights reserved.
  *
  *  Elements from ide/pci/generic.c
  *          Copyright (C) 2001-2002     Andre Hedrick <andre@linux-ide.org>
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e9e32ed6b1a3..8e37be19bbf5 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -14,7 +14,7 @@
  *
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -738,7 +738,6 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev)
  *      do_pata_set_dmamode - Initialize host controller PATA PIO timings
  *      @ap: Port whose timings we are configuring
  *      @adev: Drive in question
- *      @udma: udma mode, 0 - 6
  *      @isich: set if the chip is an ICH device
  *
  *      Set UDMA mode for device, in host controller PCI config space.
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 8cb0b360bfd8..4214bfb13bbd 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -612,7 +612,7 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)
                 if (tf->flags & ATA_TFLAG_LBA48) {
                         block |= (u64)tf->hob_lbah << 40;
                         block |= (u64)tf->hob_lbam << 32;
-                        block |= tf->hob_lbal << 24;
+                        block |= (u64)tf->hob_lbal << 24;
                 } else
                         block |= (tf->device & 0xf) << 24;
 
@@ -1268,7 +1268,7 @@ u64 ata_tf_to_lba48(const struct ata_taskfile *tf)
 
         sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40;
         sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32;
-        sectors |= (tf->hob_lbal & 0xff) << 24;
+        sectors |= ((u64)(tf->hob_lbal & 0xff)) << 24;
         sectors |= (tf->lbah & 0xff) << 16;
         sectors |= (tf->lbam & 0xff) << 8;
         sectors |= (tf->lbal & 0xff);
@@ -1602,7 +1602,6 @@ unsigned long ata_id_xfermask(const u16 *id)
 /**
  *      ata_pio_queue_task - Queue port_task
  *      @ap: The ata_port to queue port_task for
- *      @fn: workqueue function to be scheduled
  *      @data: data for @fn to use
  *      @delay: delay time in msecs for workqueue function
  *
@@ -1713,6 +1712,8 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
         else
                 tag = 0;
 
+        if (test_and_set_bit(tag, &ap->qc_allocated))
+                BUG();
         qc = __ata_qc_from_tag(ap, tag);
 
         qc->tag = tag;
@@ -2159,6 +2160,10 @@ retry:
 static inline u8 ata_dev_knobble(struct ata_device *dev)
 {
         struct ata_port *ap = dev->link->ap;
+
+        if (ata_dev_blacklisted(dev) & ATA_HORKAGE_BRIDGE_OK)
+                return 0;
+
         return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));
 }
 
@@ -4021,6 +4026,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
 
         /* Weird ATAPI devices */
         { "TORiSAN DVD-ROM DRD-N216", NULL,     ATA_HORKAGE_MAX_SEC_128 },
+        { "QUANTUM DAT    DAT72-000", NULL,     ATA_HORKAGE_ATAPI_MOD16_DMA },
 
         /* Devices we expect to fail diagnostics */
 
@@ -4063,6 +4069,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
         { "TSSTcorp CDDVDW SH-S202N", "SB00",     ATA_HORKAGE_IVB, },
         { "TSSTcorp CDDVDW SH-S202N", "SB01",     ATA_HORKAGE_IVB, },
 
+        /* Devices that do not need bridging limits applied */
+        { "MTRON MSP-SATA*",            NULL,   ATA_HORKAGE_BRIDGE_OK, },
+
         /* End Marker */
         { }
 };
@@ -4156,29 +4165,33 @@ static int cable_is_40wire(struct ata_port *ap)
         struct ata_link *link;
         struct ata_device *dev;
 
-        /* If the controller thinks we are 40 wire, we are */
+        /* If the controller thinks we are 40 wire, we are. */
         if (ap->cbl == ATA_CBL_PATA40)
                 return 1;
-        /* If the controller thinks we are 80 wire, we are */
+
+        /* If the controller thinks we are 80 wire, we are. */
         if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA)
                 return 0;
-        /* If the system is known to be 40 wire short cable (eg laptop),
-           then we allow 80 wire modes even if the drive isn't sure */
+
+        /* If the system is known to be 40 wire short cable (eg
+         * laptop), then we allow 80 wire modes even if the drive
+         * isn't sure.
+         */
         if (ap->cbl == ATA_CBL_PATA40_SHORT)
                 return 0;
-        /* If the controller doesn't know we scan
-
-           - Note: We look for all 40 wire detects at this point.
-             Any 80 wire detect is taken to be 80 wire cable
-             because
-             - In many setups only the one drive (slave if present)
-               will give a valid detect
-             - If you have a non detect capable drive you don't
-               want it to colour the choice
-        */
+
+        /* If the controller doesn't know, we scan.
+         *
+         * Note: We look for all 40 wire detects at this point.  Any
+         *       80 wire detect is taken to be 80 wire cable because
+         * - in many setups only the one drive (slave if present) will
+         *   give a valid detect
+         * - if you have a non detect capable drive you don't want it
+         *   to colour the choice
+         */
         ata_port_for_each_link(link, ap) {
                 ata_link_for_each_dev(dev, link) {
-                        if (!ata_is_40wire(dev))
+                        if (ata_dev_enabled(dev) && !ata_is_40wire(dev))
                                 return 0;
                 }
         }
@@ -4434,7 +4447,8 @@ int atapi_check_dma(struct ata_queued_cmd *qc)
         /* Don't allow DMA if it isn't multiple of 16 bytes.  Quite a
          * few ATAPI devices choke on such DMA requests.
          */
-        if (unlikely(qc->nbytes & 15))
+        if (!(qc->dev->horkage & ATA_HORKAGE_ATAPI_MOD16_DMA) &&
+            unlikely(qc->nbytes & 15))
                 return 1;
 
         if (ap->ops->check_atapi_dma)
@@ -4551,27 +4565,55 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
 }
 
 /**
- *      ata_qc_new_init - Request an available ATA command, and initialize it
+ *      ata_qc_new - Request an available ATA command, for queueing
+ *      @ap: Port associated with device @dev
  *      @dev: Device from whom we request an available command structure
  *
  *      LOCKING:
  *      None.
  */
 
-struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag)
+static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
 {
-        struct ata_port *ap = dev->link->ap;
-        struct ata_queued_cmd *qc;
+        struct ata_queued_cmd *qc = NULL;
+        unsigned int i;
 
+        /* no command while frozen */
         if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
                 return NULL;
 
-        qc = __ata_qc_from_tag(ap, tag);
+        /* the last tag is reserved for internal command. */
+        for (i = 0; i < ATA_MAX_QUEUE - 1; i++)
+                if (!test_and_set_bit(i, &ap->qc_allocated)) {
+                        qc = __ata_qc_from_tag(ap, i);
+                        break;
+                }
+
+        if (qc)
+                qc->tag = i;
+
+        return qc;
+}
+
+/**
+ *      ata_qc_new_init - Request an available ATA command, and initialize it
+ *      @dev: Device from whom we request an available command structure
+ *      @tag: command tag
+ *
+ *      LOCKING:
+ *      None.
+ */
+
+struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev)
+{
+        struct ata_port *ap = dev->link->ap;
+        struct ata_queued_cmd *qc;
+
+        qc = ata_qc_new(ap);
         if (qc) {
                 qc->scsicmd = NULL;
                 qc->ap = ap;
                 qc->dev = dev;
-                qc->tag = tag;
 
                 ata_qc_reinit(qc);
         }
@@ -4579,6 +4621,31 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag)
         return qc;
 }
 
+/**
+ *      ata_qc_free - free unused ata_queued_cmd
+ *      @qc: Command to complete
+ *
+ *      Designed to free unused ata_queued_cmd object
+ *      in case something prevents using it.
+ *
+ *      LOCKING:
+ *      spin_lock_irqsave(host lock)
+ */
+void ata_qc_free(struct ata_queued_cmd *qc)
+{
+        struct ata_port *ap = qc->ap;
+        unsigned int tag;
+
+        WARN_ON(qc == NULL);    /* ata_qc_from_tag _might_ return NULL */
+
+        qc->flags = 0;
+        tag = qc->tag;
+        if (likely(ata_tag_valid(tag))) {
+                qc->tag = ATA_TAG_POISON;
+                clear_bit(tag, &ap->qc_allocated);
+        }
+}
+
 void __ata_qc_complete(struct ata_queued_cmd *qc)
 {
         struct ata_port *ap = qc->ap;
@@ -4643,7 +4710,6 @@ static void ata_verify_xfer(struct ata_queued_cmd *qc)
 /**
  *      ata_qc_complete - Complete an active ATA command
  *      @qc: Command to complete
- *      @err_mask: ATA Status register contents
  *
  *      Indicate to the mid and upper layers that an ATA
  *      command has completed, with either an ok or not-ok status.
@@ -5924,7 +5990,7 @@ static void ata_port_detach(struct ata_port *ap)
          * to us.  Restore SControl and disable all existing devices.
          */
         __ata_port_for_each_link(link, ap) {
-                sata_scr_write(link, SCR_CONTROL, link->saved_scontrol);
+                sata_scr_write(link, SCR_CONTROL, link->saved_scontrol & 0xff0);
                 ata_link_for_each_dev(dev, link)
                         ata_dev_disable(dev);
         }
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 5d687d7cffae..32da9a93ce44 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -603,13 +603,13 @@ void ata_scsi_error(struct Scsi_Host *host)
                         ata_link_for_each_dev(dev, link) {
                                 int devno = dev->devno;
 
+                                if (!ata_dev_enabled(dev))
+                                        continue;
+
                                 ehc->saved_xfer_mode[devno] = dev->xfer_mode;
                                 if (ata_ncq_enabled(dev))
                                         ehc->saved_ncq_enabled |= 1 << devno;
                         }
-
-                        /* set last reset timestamp to some time in the past */
-                        ehc->last_reset = jiffies - 60 * HZ;
                 }
 
                 ap->pflags |= ATA_PFLAG_EH_IN_PROGRESS;
@@ -1161,6 +1161,7 @@ void ata_eh_detach_dev(struct ata_device *dev)
 {
         struct ata_link *link = dev->link;
         struct ata_port *ap = link->ap;
+        struct ata_eh_context *ehc = &link->eh_context;
         unsigned long flags;
 
         ata_dev_disable(dev);
@@ -1174,9 +1175,11 @@ void ata_eh_detach_dev(struct ata_device *dev)
                 ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;
         }
 
-        /* clear per-dev EH actions */
+        /* clear per-dev EH info */
         ata_eh_clear_action(link, dev, &link->eh_info, ATA_EH_PERDEV_MASK);
         ata_eh_clear_action(link, dev, &link->eh_context.i, ATA_EH_PERDEV_MASK);
+        ehc->saved_xfer_mode[dev->devno] = 0;
+        ehc->saved_ncq_enabled &= ~(1 << dev->devno);
 
         spin_unlock_irqrestore(ap->lock, flags);
 }
@@ -2275,17 +2278,21 @@ int ata_eh_reset(struct ata_link *link, int classify,
         if (link->flags & ATA_LFLAG_NO_SRST)
                 softreset = NULL;
 
-        now = jiffies;
-        deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN);
-        if (time_before(now, deadline))
-                schedule_timeout_uninterruptible(deadline - now);
+        /* make sure each reset attemp is at least COOL_DOWN apart */
+        if (ehc->i.flags & ATA_EHI_DID_RESET) {
+                now = jiffies;
+                WARN_ON(time_after(ehc->last_reset, now));
+                deadline = ata_deadline(ehc->last_reset,
+                                        ATA_EH_RESET_COOL_DOWN);
+                if (time_before(now, deadline))
+                        schedule_timeout_uninterruptible(deadline - now);
+        }
 
         spin_lock_irqsave(ap->lock, flags);
         ap->pflags |= ATA_PFLAG_RESETTING;
         spin_unlock_irqrestore(ap->lock, flags);
 
         ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
-        ehc->last_reset = jiffies;
 
         ata_link_for_each_dev(dev, link) {
                 /* If we issue an SRST then an ATA drive (not ATAPI)
@@ -2373,7 +2380,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
         /*
          * Perform reset
          */
-        ehc->last_reset = jiffies;
         if (ata_is_host_link(link))
                 ata_eh_freeze_port(ap);
 
@@ -2385,6 +2391,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
                                         reset == softreset ? "soft" : "hard");
 
                 /* mark that this EH session started with reset */
+                ehc->last_reset = jiffies;
                 if (reset == hardreset)
                         ehc->i.flags |= ATA_EHI_DID_HARDRESET;
                 else
@@ -2529,7 +2536,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
         ata_eh_done(link, NULL, ATA_EH_RESET);
         if (slave)
                 ata_eh_done(slave, NULL, ATA_EH_RESET);
-        ehc->last_reset = jiffies;
+        ehc->last_reset = jiffies;      /* update to completion time */
         ehc->i.action |= ATA_EH_REVALIDATE;
 
         rc = 0;
@@ -2787,6 +2794,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 
         /* if data transfer is verified, clear DUBIOUS_XFER on ering top */
         ata_link_for_each_dev(dev, link) {
+                if (!ata_dev_enabled(dev))
+                        continue;
+
                 if (!(dev->flags & ATA_DFLAG_DUBIOUS_XFER)) {
                         struct ata_ering_entry *ent;
 
@@ -2808,6 +2818,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                 u8 saved_xfer_mode = ehc->saved_xfer_mode[dev->devno];
                 u8 saved_ncq = !!(ehc->saved_ncq_enabled & (1 << dev->devno));
 
+                if (!ata_dev_enabled(dev))
+                        continue;
+
                 if (dev->xfer_mode != saved_xfer_mode ||
                     ata_ncq_enabled(dev) != saved_ncq)
                         dev->flags |= ATA_DFLAG_DUBIOUS_XFER;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 4b95c4387e9e..47c7afcb36f2 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -190,7 +190,7 @@ static ssize_t ata_scsi_park_show(struct device *device,
         struct ata_port *ap;
         struct ata_link *link;
         struct ata_device *dev;
-        unsigned long flags;
+        unsigned long flags, now;
         unsigned int uninitialized_var(msecs);
         int rc = 0;
 
@@ -208,10 +208,11 @@ static ssize_t ata_scsi_park_show(struct device *device,
         }
 
         link = dev->link;
+        now = jiffies;
         if (ap->pflags & ATA_PFLAG_EH_IN_PROGRESS &&
             link->eh_context.unloaded_mask & (1 << dev->devno) &&
-            time_after(dev->unpark_deadline, jiffies))
-                msecs = jiffies_to_msecs(dev->unpark_deadline - jiffies);
+            time_after(dev->unpark_deadline, now))
+                msecs = jiffies_to_msecs(dev->unpark_deadline - now);
         else
                 msecs = 0;
 
@@ -708,11 +709,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
 {
         struct ata_queued_cmd *qc;
 
-        if (cmd->request->tag != -1)
-                qc = ata_qc_new_init(dev, cmd->request->tag);
-        else
-                qc = ata_qc_new_init(dev, 0);
-
+        qc = ata_qc_new_init(dev);
         if (qc) {
                 qc->scsicmd = cmd;
                 qc->scsidone = done;
@@ -1107,8 +1104,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,
 
                 depth = min(sdev->host->can_queue, ata_id_queue_depth(dev->id));
                 depth = min(ATA_MAX_QUEUE - 1, depth);
-                scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
-                scsi_activate_tcq(sdev, depth);
+                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);
         }
 
         return 0;
@@ -1948,11 +1944,6 @@ static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf)
                 hdr[1] |= (1 << 7);
 
         memcpy(rbuf, hdr, sizeof(hdr));
-
-        /* if ncq, set tags supported */
-        if (ata_id_has_ncq(args->id))
-                rbuf[7] |= (1 << 1);
-
         memcpy(&rbuf[8], "ATA     ", 8);
         ata_id_string(args->id, &rbuf[16], ATA_ID_PROD, 16);
         ata_id_string(args->id, &rbuf[32], ATA_ID_FW_REV, 4);
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index d3831d39bdaa..fe2839e58774 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -74,7 +74,7 @@ extern struct ata_link *ata_dev_phys_link(struct ata_device *dev);
 extern void ata_force_cbl(struct ata_port *ap);
 extern u64 ata_tf_to_lba(const struct ata_taskfile *tf);
 extern u64 ata_tf_to_lba48(const struct ata_taskfile *tf);
-extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev, int tag);
+extern struct ata_queued_cmd *ata_qc_new_init(struct ata_device *dev);
 extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                            u64 block, u32 n_block, unsigned int tf_flags,
                            unsigned int tag);
@@ -103,6 +103,7 @@ extern int ata_dev_configure(struct ata_device *dev);
 extern int sata_down_spd_limit(struct ata_link *link);
 extern int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel);
 extern void ata_sg_clean(struct ata_queued_cmd *qc);
+extern void ata_qc_free(struct ata_queued_cmd *qc);
 extern void ata_qc_issue(struct ata_queued_cmd *qc);
 extern void __ata_qc_complete(struct ata_queued_cmd *qc);
 extern int atapi_check_dma(struct ata_queued_cmd *qc);
@@ -118,22 +119,6 @@ extern struct ata_port *ata_port_alloc(struct ata_host *host);
 extern void ata_dev_enable_pm(struct ata_device *dev, enum link_pm policy);
 extern void ata_lpm_schedule(struct ata_port *ap, enum link_pm);
 
-/**
- *      ata_qc_free - free unused ata_queued_cmd
- *      @qc: Command to complete
- *
- *      Designed to free unused ata_queued_cmd object
- *      in case something prevents using it.
- *
- *      LOCKING:
- *      spin_lock_irqsave(host lock)
- */
-static inline void ata_qc_free(struct ata_queued_cmd *qc)
-{
-        qc->flags = 0;
-        qc->tag = ATA_TAG_POISON;
-}
-
 /* libata-acpi.c */
 #ifdef CONFIG_ATA_ACPI
 extern void ata_acpi_associate_sata_port(struct ata_port *ap);
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index eb919c16a03e..e2e332d8ff95 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -1,7 +1,7 @@
 /*
  *      ACPI PATA driver
  *
- *      (c) 2007 Red Hat  <alan@redhat.com>
+ *      (c) 2007 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 5ca70fa1f587..73c466e452ca 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -1,7 +1,6 @@
 /*
  * pata_ali.c   - ALI 15x3 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based in part upon
  * linux/drivers/ide/pci/alim15x3.c             Version 0.17    2003/01/02
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 57dd00f463d3..0ec9c7d9fe9d 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -1,7 +1,6 @@
 /*
  * pata_amd.c   - AMD PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  Based on pata-sil680. Errata information is taken from data sheets
  *  and the amd74xx.c driver by Vojtech Pavlik. Nvidia SATA devices are
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 0f513bc11193..6b3092c75ffe 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -1,7 +1,7 @@
 /*
  *    pata_artop.c - ARTOP ATA controller driver
  *
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *      (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based in part on drivers/ide/pci/aec62xx.c
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index e8a0d99d7356..0e2cde8f9973 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -1,7 +1,6 @@
 /*
  * pata_atiixp.c        - ATI PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based on
  *
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 2de30b990278..34a394264c3d 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -1,7 +1,6 @@
 /*
  * pata_cmd640.c        - CMD640 PCI PATA for new ATA layer
  *                        (C) 2007 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based upon
  *  linux/drivers/ide/pci/cmd640.c              Version 1.02  Sep 01, 1996
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index ddd09b7d98c9..3167d8fed2f2 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -1,7 +1,7 @@
 /*
  * pata_cmd64x.c        - CMD64x PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Based upon
  * linux/drivers/ide/pci/cmd64x.c               Version 1.30    Sept 10, 2002
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 0c4b271a9d5a..bba453381f44 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -1,7 +1,6 @@
 /*
  * pata-cs5530.c        - CS5530 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon cs5530.c by Mark Lord.
  *
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index f1b6556f0483..8b236af84c2e 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -1,7 +1,7 @@
 /*
  * pata-cs5535.c        - CS5535 PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * based upon cs5535.c from AMD <Jens.Altmann@amd.com> as cleaned up and
  * made readable and Linux style by Wolfgang Zuleger <wolfgang.zuleger@gmx.de
@@ -72,7 +72,6 @@
 /**
  *      cs5535_cable_detect     -       detect cable type
  *      @ap: Port to detect on
- *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection for ATA66 capable cable. Return a libata
  *      cable type.
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 73f8332cb679..afed92976198 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -110,7 +110,6 @@ static inline int cs5536_write(struct pci_dev *pdev, int reg, int val)
 /**
  *      cs5536_cable_detect     -       detect cable type
  *      @ap: Port to detect on
- *      @deadline: deadline jiffies for the operation
  *
  *      Perform cable detection for ATA66 capable cable. Return a libata
  *      cable type.
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 2ff62608ae37..d546425cd380 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -1,7 +1,7 @@
 /*
  * pata_cypress.c       - Cypress PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox
  *
  * Based heavily on
  * linux/drivers/ide/pci/cy82c693.c             Version 0.40    Sep. 10, 2002
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 9fba82976ba6..ac6392ea35b0 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -1,7 +1,7 @@
 /*
  *    pata_efar.c - EFAR PIIX clone controller driver
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 6a111baab523..15cdb9148aab 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -1,7 +1,7 @@
 
 /*
  *   pata-isapnp.c - ISA PnP PATA controller driver.
- *   Copyright 2005/2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat Inc, all rights reserved.
  *
  *   Based in part on ide-pnp.c by Andrey Panin <pazke@donpac.ru>
  */
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 0221c9a46769..860ede526282 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -1,7 +1,7 @@
 /*
  * pata_it821x.c        - IT821x PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                        (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * based upon
@@ -10,7 +10,7 @@
  *
  * linux/drivers/ide/pci/it821x.c               Version 0.09    December 2004
  *
- * Copyright (C) 2004           Red Hat <alan@redhat.com>
+ * Copyright (C) 2004           Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  *  Based in part on the ITE vendor provided SCSI driver.
@@ -557,9 +557,8 @@ static unsigned int it821x_read_id(struct ata_device *adev,
         if (strstr(model_num, "Integrated Technology Express")) {
                 /* Set feature bits the firmware neglects */
                 id[49] |= 0x0300;       /* LBA, DMA */
-                id[82] |= 0x0400;       /* LBA48 */
                 id[83] &= 0x7FFF;
-                id[83] |= 0x4000;       /* Word 83 is valid */
+                id[83] |= 0x4400;       /* Word 83 is valid and LBA48 */
                 id[86] |= 0x0400;       /* LBA48 on */
                 id[ATA_ID_MAJOR_VER] |= 0x1F;
         }
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 73b7596816b4..38cf1ab2d289 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -4,7 +4,7 @@
  *                      driven by AHCI in the usual configuration although
  *                      this driver can handle other setups if we need it.
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index bc037ffce200..930c2208640b 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -1,6 +1,6 @@
 /*
  *   pata-legacy.c - Legacy port PATA/SATA controller driver.
- *   Copyright 2005/2006 Red Hat <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005/2006 Red Hat, all rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 0d87eec84966..76e399bf8c1b 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -5,7 +5,7 @@
  *      isn't making full use of the device functionality but it is
  *      easy to get working.
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 7d7e3fdab71f..7c8faa48b5f3 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -1,7 +1,7 @@
 /*
  * pata_mpiix.c         - Intel MPIIX PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * The MPIIX is different enough to the PIIX4 and friends that we give it
  * a separate driver. The old ide/pci code handles this by just not tuning
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index d9719c8b9dbe..9dc05e1656a8 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -1,7 +1,7 @@
 /*
  *    pata_netcell.c - Netcell PATA driver
  *
- *      (c) 2006 Red Hat  <alan@redhat.com>
+ *      (c) 2006 Red Hat
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 565e67cd13fa..4e466eae8b46 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -1,7 +1,6 @@
 /*
  * pata_ninja32.c       - Ninja32 PATA for new ATA layer
  *                        (C) 2007 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Note: The controller like many controllers has shared timings for
  * PIO and DMA. We thus flip to the DMA timings in dma_start and flip back
@@ -45,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_ninja32"
-#define DRV_VERSION "0.0.1"
+#define DRV_VERSION "0.1.1"
 
 
 /**
@@ -89,6 +88,17 @@ static struct ata_port_operations ninja32_port_ops = {
         .set_piomode    = ninja32_set_piomode,
 };
 
+static void ninja32_program(void __iomem *base)
+{
+        iowrite8(0x05, base + 0x01);    /* Enable interrupt lines */
+        iowrite8(0xBE, base + 0x02);    /* Burst, ?? setup */
+        iowrite8(0x01, base + 0x03);    /* Unknown */
+        iowrite8(0x20, base + 0x04);    /* WAIT0 */
+        iowrite8(0x8f, base + 0x05);    /* Unknown */
+        iowrite8(0xa4, base + 0x1c);    /* Unknown */
+        iowrite8(0x83, base + 0x1d);    /* BMDMA control: WAIT0 */
+}
+
 static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct ata_host *host;
@@ -134,18 +144,28 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
         ap->ioaddr.bmdma_addr = base;
         ata_sff_std_ports(&ap->ioaddr);
 
-        iowrite8(0x05, base + 0x01);    /* Enable interrupt lines */
-        iowrite8(0xBE, base + 0x02);    /* Burst, ?? setup */
-        iowrite8(0x01, base + 0x03);    /* Unknown */
-        iowrite8(0x20, base + 0x04);    /* WAIT0 */
-        iowrite8(0x8f, base + 0x05);    /* Unknown */
-        iowrite8(0xa4, base + 0x1c);    /* Unknown */
-        iowrite8(0x83, base + 0x1d);    /* BMDMA control: WAIT0 */
+        ninja32_program(base);
         /* FIXME: Should we disable them at remove ? */
         return ata_host_activate(host, dev->irq, ata_sff_interrupt,
                                  IRQF_SHARED, &ninja32_sht);
 }
 
+#ifdef CONFIG_PM
+
+static int ninja32_reinit_one(struct pci_dev *pdev)
+{
+        struct ata_host *host = dev_get_drvdata(&pdev->dev);
+        int rc;
+
+        rc = ata_pci_device_do_resume(pdev);
+        if (rc)
+                return rc;
+        ninja32_program(host->iomap[0]);
+        ata_host_resume(host);
+        return 0;                       
+}
+#endif
+
 static const struct pci_device_id ninja32[] = {
         { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
@@ -156,7 +176,11 @@ static struct pci_driver ninja32_pci_driver = {
         .name           = DRV_NAME,
         .id_table       = ninja32,
         .probe          = ninja32_init_one,
-        .remove         = ata_pci_remove_one
+        .remove         = ata_pci_remove_one,
+#ifdef CONFIG_PM
+        .suspend        = ata_pci_device_suspend,
+        .resume         = ninja32_reinit_one,
+#endif
 };
 
 static int __init ninja32_init(void)
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index be756b7ef07e..40d411c460de 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -1,7 +1,6 @@
 /*
  * pata_ns87410.c       - National Semiconductor 87410 PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index e0aa7eaaee0a..89bf5f865d6a 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -1,7 +1,7 @@
 /*
  *    pata_ns87415.c - NS87415 (non PARISC) PATA
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat <alan@lxorguk.ukuu.org.uk>
  *
  *    This is a fairly generic MWDMA controller. It has some limitations
  *    as it requires timing reloads on PIO/DMA transitions but it is otherwise
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index df64f2443001..c0dbc46a348e 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -1,7 +1,7 @@
 /*
  *    pata_oldpiix.c - Intel PATA/SATA controllers
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index fb2cf661b0e8..e4fa4d565e96 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -1,7 +1,6 @@
 /*
  * pata_opti.c  - ATI PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based on
  *  linux/drivers/ide/pci/opti621.c             Version 0.7     Sept 10, 2002
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index 4cd744456313..93bb6e91973f 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -1,7 +1,6 @@
 /*
  * pata_optidma.c       - Opti DMA PATA for new ATA layer
  *                        (C) 2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *      The Opti DMA controllers are related to the older PIO PCI controllers
  *      and indeed the VLB ones. The main differences are that the timing
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 02b596b9cf6a..64b2e2281ee7 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -1,6 +1,6 @@
 /*
  *   pata_pcmcia.c - PCMCIA PATA controller driver.
- *   Copyright 2005-2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *   PCMCIA ident update Copyright 2006 Marcin Juszkiewicz
  *                                              <openembedded@hrw.one.pl>
  *
@@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
         PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
         PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
         PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+        PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),
         PCMCIA_DEVICE_NULL,
 };
 
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index d2673060bc8d..799a6a098712 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -1,7 +1,7 @@
 /*
  * pata_pdc202xx_old.c  - Promise PDC202xx PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *                        (C) 2007 Bartlomiej Zolnierkiewicz
  *
  * Based in part on linux/drivers/ide/pci/pdc202xx_old.c
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 8f65ad61b8af..77e4e3b17f54 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -5,7 +5,7 @@
  *
  * Based on pata_pcmcia:
  *
- *   Copyright 2005-2006 Red Hat Inc <alan@redhat.com>, all rights reserved.
+ *   Copyright 2005-2006 Red Hat Inc, all rights reserved.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 63b7a1c165a5..3080f371222c 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -1,6 +1,6 @@
 /*
  *    pata_qdi.c - QDI VLB ATA controllers
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *
  * This driver mostly exists as a proof of concept for non PCI devices under
  * libata. While the QDI6580 was 'neat' in 1993 it is no longer terribly
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 1c0d9fa7ee54..0b0aa452de14 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -1,7 +1,7 @@
 /*
  *    pata_radisys.c - Intel PATA/SATA controllers
  *
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat <alan@lxorguk.ukuu.org.uk>
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 0278fd2b8fb1..9a4bdca54616 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -1,5 +1,5 @@
 /*
- * New ATA layer SC1200 driver          Alan Cox <alan@redhat.com>
+ * New ATA layer SC1200 driver          Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * TODO: Mode selection filtering
  * TODO: Can't enable second channel until ATA core has serialize
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 16673d168573..cf3707e516a2 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -8,7 +8,7 @@
  *  Copyright 2003-2005 Jeff Garzik
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat Inc
  *
  * and drivers/ata/ahci.c:
  *  Copyright 2004-2005 Red Hat, Inc.
diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index c8cc027789fe..6aeeeeb34124 100644
--- a/drivers/ata/pata_sch.c
+++ b/drivers/ata/pata_sch.c
@@ -83,7 +83,7 @@ static struct ata_port_operations sch_pata_ops = {
 };
 
 static struct ata_port_info sch_port_info = {
-        .flags          = 0,
+        .flags          = ATA_FLAG_SLAVE_POSS,
         .pio_mask       = ATA_PIO4,   /* pio0-4 */
         .mwdma_mask     = ATA_MWDMA2, /* mwdma0-2 */
         .udma_mask      = ATA_UDMA5,  /* udma0-5 */
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index ffd26d0dc50d..72e41c9f969b 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -1,7 +1,6 @@
 /*
  * pata_serverworks.c   - Serverworks PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index a598bb36aafc..83580a59db58 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -1,7 +1,6 @@
 /*
  * pata_sil680.c        - SIL680 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 26345d7b531c..d34236611752 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -1,7 +1,7 @@
 /*
  *    pata_sis.c - SiS ATA driver
  *
- *      (C) 2005 Red Hat <alan@redhat.com>
+ *      (C) 2005 Red Hat
  *      (C) 2007 Bartlomiej Zolnierkiewicz
  *
  *    Based upon linux/drivers/ide/pci/sis5513.c
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 69877bd81815..1b0e7b6d8ef5 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -1,7 +1,6 @@
 /*
  * pata_sl82c105.c      - SL82C105 PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  * Based in part on linux/drivers/ide/pci/sl82c105.c
  *              SL82C105/Winbond 553 IDE driver
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index b181261f2743..ef9597517cdd 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -1,7 +1,7 @@
 /*
  * pata_triflex.c       - Compaq PATA for new ATA layer
  *                        (C) 2005 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
+ *                        Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * based upon
  *
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 8fdb2ce73210..681169c9c640 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -1,7 +1,6 @@
 /*
  * pata_via.c   - VIA PATA for new ATA layer
  *                        (C) 2005-2006 Red Hat Inc
- *                        Alan Cox <alan@redhat.com>
  *
  *  Documentation
  *      Most chipset documentation available under NDA only
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index a7606b044a61..319e164a3d74 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -1,6 +1,6 @@
 /*
  *    pata_winbond.c - Winbond VLB ATA controllers
- *      (C) 2006 Red Hat <alan@redhat.com>
+ *      (C) 2006 Red Hat
  *
  *    Support for the Winbond 83759A when operating in advanced mode.
  *    Multichip mode is not currently supported.
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index fae3841de0d8..6f1460614325 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -307,10 +307,10 @@ static int nv_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
 
 static void nv_nf2_freeze(struct ata_port *ap);
 static void nv_nf2_thaw(struct ata_port *ap);
+static int nv_nf2_hardreset(struct ata_link *link, unsigned int *class,
+                            unsigned long deadline);
 static void nv_ck804_freeze(struct ata_port *ap);
 static void nv_ck804_thaw(struct ata_port *ap);
-static int nv_hardreset(struct ata_link *link, unsigned int *class,
-                        unsigned long deadline);
 static int nv_adma_slave_config(struct scsi_device *sdev);
 static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc);
 static void nv_adma_qc_prep(struct ata_queued_cmd *qc);
@@ -405,17 +405,8 @@ static struct scsi_host_template nv_swncq_sht = {
         .slave_configure        = nv_swncq_slave_config,
 };
 
-/* OSDL bz3352 reports that some nv controllers can't determine device
- * signature reliably and nv_hardreset is implemented to work around
- * the problem.  This was reported on nf3 and it's unclear whether any
- * other controllers are affected.  However, the workaround has been
- * applied to all variants and there isn't much to gain by trying to
- * find out exactly which ones are affected at this point especially
- * because NV has moved over to ahci for newer controllers.
- */
 static struct ata_port_operations nv_common_ops = {
         .inherits               = &ata_bmdma_port_ops,
-        .hardreset              = nv_hardreset,
         .scr_read               = nv_scr_read,
         .scr_write              = nv_scr_write,
 };
@@ -429,12 +420,22 @@ static struct ata_port_operations nv_generic_ops = {
         .hardreset              = ATA_OP_NULL,
 };
 
+/* OSDL bz3352 reports that nf2/3 controllers can't determine device
+ * signature reliably.  Also, the following thread reports detection
+ * failure on cold boot with the standard debouncing timing.
+ *
+ * http://thread.gmane.org/gmane.linux.ide/34098
+ *
+ * Debounce with hotplug timing and request follow-up SRST.
+ */
 static struct ata_port_operations nv_nf2_ops = {
         .inherits               = &nv_common_ops,
         .freeze                 = nv_nf2_freeze,
         .thaw                   = nv_nf2_thaw,
+        .hardreset              = nv_nf2_hardreset,
 };
 
+/* CK804 finally gets hardreset right */
 static struct ata_port_operations nv_ck804_ops = {
         .inherits               = &nv_common_ops,
         .freeze                 = nv_ck804_freeze,
@@ -443,7 +444,7 @@ static struct ata_port_operations nv_ck804_ops = {
 };
 
 static struct ata_port_operations nv_adma_ops = {
-        .inherits               = &nv_common_ops,
+        .inherits               = &nv_ck804_ops,
 
         .check_atapi_dma        = nv_adma_check_atapi_dma,
         .sff_tf_read            = nv_adma_tf_read,
@@ -467,7 +468,7 @@ static struct ata_port_operations nv_adma_ops = {
 };
 
 static struct ata_port_operations nv_swncq_ops = {
-        .inherits               = &nv_common_ops,
+        .inherits               = &nv_generic_ops,
 
         .qc_defer               = ata_std_qc_defer,
         .qc_prep                = nv_swncq_qc_prep,
@@ -1553,6 +1554,17 @@ static void nv_nf2_thaw(struct ata_port *ap)
         iowrite8(mask, scr_addr + NV_INT_ENABLE);
 }
 
+static int nv_nf2_hardreset(struct ata_link *link, unsigned int *class,
+                            unsigned long deadline)
+{
+        bool online;
+        int rc;
+
+        rc = sata_link_hardreset(link, sata_deb_timing_hotplug, deadline,
+                                 &online, NULL);
+        return online ? -EAGAIN : rc;
+}
+
 static void nv_ck804_freeze(struct ata_port *ap)
 {
         void __iomem *mmio_base = ap->host->iomap[NV_MMIO_BAR];
@@ -1605,21 +1617,6 @@ static void nv_mcp55_thaw(struct ata_port *ap)
         ata_sff_thaw(ap);
 }
 
-static int nv_hardreset(struct ata_link *link, unsigned int *class,
-                        unsigned long deadline)
-{
-        int rc;
-
-        /* SATA hardreset fails to retrieve proper device signature on
-         * some controllers.  Request follow up SRST.  For more info,
-         * see http://bugzilla.kernel.org/show_bug.cgi?id=3352
-         */
-        rc = sata_sff_hardreset(link, class, deadline);
-        if (rc)
-                return rc;
-        return -EAGAIN;
-}
-
 static void nv_adma_error_handler(struct ata_port *ap)
 {
         struct nv_adma_port_priv *pp = ap->private_data;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 750d8cdc00cd..ba9a2570a742 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -153,6 +153,10 @@ static void pdc_freeze(struct ata_port *ap);
 static void pdc_sata_freeze(struct ata_port *ap);
 static void pdc_thaw(struct ata_port *ap);
 static void pdc_sata_thaw(struct ata_port *ap);
+static int pdc_pata_softreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline);
+static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline);
 static void pdc_error_handler(struct ata_port *ap);
 static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
 static int pdc_pata_cable_detect(struct ata_port *ap);
@@ -186,6 +190,7 @@ static struct ata_port_operations pdc_sata_ops = {
         .scr_read               = pdc_sata_scr_read,
         .scr_write              = pdc_sata_scr_write,
         .port_start             = pdc_sata_port_start,
+        .hardreset              = pdc_sata_hardreset,
 };
 
 /* First-generation chips need a more restrictive ->check_atapi_dma op */
@@ -200,6 +205,7 @@ static struct ata_port_operations pdc_pata_ops = {
         .freeze                 = pdc_freeze,
         .thaw                   = pdc_thaw,
         .port_start             = pdc_common_port_start,
+        .softreset              = pdc_pata_softreset,
 };
 
 static const struct ata_port_info pdc_port_info[] = {
@@ -693,6 +699,20 @@ static void pdc_sata_thaw(struct ata_port *ap)
         readl(host_mmio + hotplug_offset); /* flush */
 }
 
+static int pdc_pata_softreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline)
+{
+        pdc_reset_port(link->ap);
+        return ata_sff_softreset(link, class, deadline);
+}
+
+static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
+                              unsigned long deadline)
+{
+        pdc_reset_port(link->ap);
+        return sata_sff_hardreset(link, class, deadline);
+}
+
 static void pdc_error_handler(struct ata_port *ap)
 {
         if (!(ap->pflags & ATA_PFLAG_FROZEN))
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 4621807a1a6a..ccee930f1e12 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1329,6 +1329,11 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         }
 
+        /* Set max read request size to 4096.  This slightly increases
+         * write throughput for pci-e variants.
+         */
+        pcie_set_readrq(pdev, 4096);
+
         sil24_init_controller(host);
 
         pci_set_master(pdev);
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 5b72e734300a..c18935f0bda2 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -44,11 +44,16 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.3"
+#define DRV_VERSION     "2.4"
 
+/*
+ * vt8251 is different from other sata controllers of VIA.  It has two
+ * channels, each channel has both Master and Slave slot.
+ */
 enum board_ids_enum {
         vt6420,
         vt6421,
+        vt8251,
 };
 
 enum {
@@ -70,6 +75,8 @@ enum {
 static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
 static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
+static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val);
+static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val);
 static void svia_tf_load(struct ata_port *ap, const struct ata_taskfile *tf);
 static void svia_noop_freeze(struct ata_port *ap);
 static int vt6420_prereset(struct ata_link *link, unsigned long deadline);
@@ -79,12 +86,12 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev);
 
 static const struct pci_device_id svia_pci_tbl[] = {
         { PCI_VDEVICE(VIA, 0x5337), vt6420 },
-        { PCI_VDEVICE(VIA, 0x0591), vt6420 },
-        { PCI_VDEVICE(VIA, 0x3149), vt6420 },
-        { PCI_VDEVICE(VIA, 0x3249), vt6421 },
-        { PCI_VDEVICE(VIA, 0x5287), vt6420 },
+        { PCI_VDEVICE(VIA, 0x0591), vt6420 }, /* 2 sata chnls (Master) */
+        { PCI_VDEVICE(VIA, 0x3149), vt6420 }, /* 2 sata chnls (Master) */
+        { PCI_VDEVICE(VIA, 0x3249), vt6421 }, /* 2 sata chnls, 1 pata chnl */
         { PCI_VDEVICE(VIA, 0x5372), vt6420 },
         { PCI_VDEVICE(VIA, 0x7372), vt6420 },
+        { PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */
 
         { }     /* terminate list */
 };
@@ -128,6 +135,13 @@ static struct ata_port_operations vt6421_sata_ops = {
         .scr_write              = svia_scr_write,
 };
 
+static struct ata_port_operations vt8251_ops = {
+        .inherits               = &svia_base_ops,
+        .hardreset              = sata_std_hardreset,
+        .scr_read               = vt8251_scr_read,
+        .scr_write              = vt8251_scr_write,
+};
+
 static const struct ata_port_info vt6420_port_info = {
         .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
         .pio_mask       = 0x1f,
@@ -152,6 +166,15 @@ static struct ata_port_info vt6421_pport_info = {
         .port_ops       = &vt6421_pata_ops,
 };
 
+static struct ata_port_info vt8251_port_info = {
+        .flags          = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS |
+                          ATA_FLAG_NO_LEGACY,
+        .pio_mask       = 0x1f,
+        .mwdma_mask     = 0x07,
+        .udma_mask      = ATA_UDMA6,
+        .port_ops       = &vt8251_ops,
+};
+
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers");
 MODULE_LICENSE("GPL");
@@ -174,6 +197,83 @@ static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)
         return 0;
 }
 
+static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val)
+{
+        static const u8 ipm_tbl[] = { 1, 2, 6, 0 };
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        int slot = 2 * link->ap->port_no + link->pmp;
+        u32 v = 0;
+        u8 raw;
+
+        switch (scr) {
+        case SCR_STATUS:
+                pci_read_config_byte(pdev, 0xA0 + slot, &raw);
+
+                /* read the DET field, bit0 and 1 of the config byte */
+                v |= raw & 0x03;
+
+                /* read the SPD field, bit4 of the configure byte */
+                if (raw & (1 << 4))
+                        v |= 0x02 << 4;
+                else
+                        v |= 0x01 << 4;
+
+                /* read the IPM field, bit2 and 3 of the config byte */
+                v |= ipm_tbl[(raw >> 2) & 0x3];
+                break;
+
+        case SCR_ERROR:
+                /* devices other than 5287 uses 0xA8 as base */
+                WARN_ON(pdev->device != 0x5287);
+                pci_read_config_dword(pdev, 0xB0 + slot * 4, &v);
+                break;
+
+        case SCR_CONTROL:
+                pci_read_config_byte(pdev, 0xA4 + slot, &raw);
+
+                /* read the DET field, bit0 and bit1 */
+                v |= ((raw & 0x02) << 1) | (raw & 0x01);
+
+                /* read the IPM field, bit2 and bit3 */
+                v |= ((raw >> 2) & 0x03) << 8;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        *val = v;
+        return 0;
+}
+
+static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val)
+{
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        int slot = 2 * link->ap->port_no + link->pmp;
+        u32 v = 0;
+
+        switch (scr) {
+        case SCR_ERROR:
+                /* devices other than 5287 uses 0xA8 as base */
+                WARN_ON(pdev->device != 0x5287);
+                pci_write_config_dword(pdev, 0xB0 + slot * 4, val);
+                return 0;
+
+        case SCR_CONTROL:
+                /* set the DET field */
+                v |= ((val & 0x4) >> 1) | (val & 0x1);
+
+                /* set the IPM field */
+                v |= ((val >> 8) & 0x3) << 2;
+
+                pci_write_config_byte(pdev, 0xA4 + slot, v);
+                return 0;
+
+        default:
+                return -EINVAL;
+        }
+}
+
 /**
  *      svia_tf_load - send taskfile registers to host controller
  *      @ap: Port to which output is sent
@@ -396,6 +496,30 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
         return 0;
 }
 
+static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
+{
+        const struct ata_port_info *ppi[] = { &vt8251_port_info, NULL };
+        struct ata_host *host;
+        int i, rc;
+
+        rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
+        if (rc)
+                return rc;
+        *r_host = host;
+
+        rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME);
+        if (rc) {
+                dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+                return rc;
+        }
+
+        /* 8251 hosts four sata ports as M/S of the two channels */
+        for (i = 0; i < host->n_ports; i++)
+                ata_slave_link_init(host->ports[i]);
+
+        return 0;
+}
+
 static void svia_configure(struct pci_dev *pdev)
 {
         u8 tmp8;
@@ -451,10 +575,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (rc)
                 return rc;
 
-        if (board_id == vt6420)
-                bar_sizes = &svia_bar_sizes[0];
-        else
+        if (board_id == vt6421)
                 bar_sizes = &vt6421_bar_sizes[0];
+        else
+                bar_sizes = &svia_bar_sizes[0];
 
         for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++)
                 if ((pci_resource_start(pdev, i) == 0) ||
@@ -467,10 +591,19 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                         return -ENODEV;
                 }
 
-        if (board_id == vt6420)
+        switch (board_id) {
+        case vt6420:
                 rc = vt6420_prepare_host(pdev, &host);
-        else
+                break;
+        case vt6421:
                 rc = vt6421_prepare_host(pdev, &host);
+                break;
+        case vt8251:
+                rc = vt8251_prepare_host(pdev, &host);
+                break;
+        default:
+                rc = -EINVAL;
+        }
         if (rc)
                 return rc;
 
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 75dd6e22faff..c98c31ec2f75 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -355,7 +355,7 @@ static void __sysdev_resume(struct sys_device *dev)
  *      sysdev_suspend - Suspend all system devices.
  *      @state:         Power state to enter.
  *
- *      We perform an almost identical operation as sys_device_shutdown()
+ *      We perform an almost identical operation as sysdev_shutdown()
  *      above, though calling ->suspend() instead. Interrupts are disabled
  *      when this called. Devices are responsible for both saving state and
  *      quiescing or powering down the device.
@@ -437,7 +437,7 @@ aux_driver:
 /**
  *      sysdev_resume - Bring system devices back to life.
  *
- *      Similar to sys_device_suspend(), but we iterate the list forwards
+ *      Similar to sysdev_suspend(), but we iterate the list forwards
  *      to guarantee that parent devices are resumed before their children.
  *
  *      Note: Interrupts are disabled when called.
@@ -488,7 +488,8 @@ ssize_t sysdev_store_ulong(struct sys_device *sysdev,
         if (end == buf)
                 return -EINVAL;
         *(unsigned long *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_ulong);
 
@@ -511,7 +512,8 @@ ssize_t sysdev_store_int(struct sys_device *sysdev,
         if (end == buf || new > INT_MAX || new < INT_MIN)
                 return -EINVAL;
         *(int *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_int);
 
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4023885353e0..12de1fdaa6c6 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -96,6 +96,8 @@ static const struct pci_device_id cciss_pci_device_id[] = {
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3247},
         {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},
+        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324A},
+        {PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324B},
         {PCI_VENDOR_ID_HP,     PCI_ANY_ID,      PCI_ANY_ID, PCI_ANY_ID,
                 PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
         {0,}
@@ -133,6 +135,8 @@ static struct board_type products[] = {
         {0x3245103C, "Smart Array P410i", &SA5_access},
         {0x3247103C, "Smart Array P411", &SA5_access},
         {0x3249103C, "Smart Array P812", &SA5_access},
+        {0x324A103C, "Smart Array P712m", &SA5_access},
+        {0x324B103C, "Smart Array P711m", &SA5_access},
         {0xFFFF103C, "Unknown Smart Array", &SA5_access},
 };
 
@@ -1366,6 +1370,7 @@ static void cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
         disk->first_minor = drv_index << NWD_SHIFT;
         disk->fops = &cciss_fops;
         disk->private_data = &h->drv[drv_index];
+        disk->driverfs_dev = &h->pdev->dev;
 
         /* Set up queue information */
         blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
@@ -3404,7 +3409,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         int i;
         int j = 0;
         int rc;
-        int dac;
+        int dac, return_code;
+        InquiryData_struct *inq_buff = NULL;
 
         i = alloc_cciss_hba();
         if (i < 0)
@@ -3510,6 +3516,25 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         /* Turn the interrupts on so we can service requests */
         hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
 
+        /* Get the firmware version */
+        inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
+        if (inq_buff == NULL) {
+                printk(KERN_ERR "cciss: out of memory\n");
+                goto clean4;
+        }
+
+        return_code = sendcmd_withirq(CISS_INQUIRY, i, inq_buff,
+                sizeof(InquiryData_struct), 0, 0 , 0, TYPE_CMD);
+        if (return_code == IO_OK) {
+                hba[i]->firm_ver[0] = inq_buff->data_byte[32];
+                hba[i]->firm_ver[1] = inq_buff->data_byte[33];
+                hba[i]->firm_ver[2] = inq_buff->data_byte[34];
+                hba[i]->firm_ver[3] = inq_buff->data_byte[35];
+        } else {         /* send command failed */
+                printk(KERN_WARNING "cciss: unable to determine firmware"
+                        " version of controller\n");
+        }
+
         cciss_procinit(i);
 
         hba[i]->cciss_max_sectors = 2048;
@@ -3520,6 +3545,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         return 1;
 
 clean4:
+        kfree(inq_buff);
 #ifdef CONFIG_CISS_SCSI_TAPE
         kfree(hba[i]->scsi_rejects.complete);
 #endif
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 47d233c6d0b3..5d39df14ed90 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -567,7 +567,12 @@ static int __init cpqarray_init(void)
                         num_cntlrs_reg++;
         }
 
-        return(num_cntlrs_reg);
+        if (num_cntlrs_reg)
+                return 0;
+        else {
+                pci_unregister_driver(&cpqarray_pci_driver);
+                return -ENODEV;
+        }
 }
 
 /* Function to find the first free pointer into our hba[] array */
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3f09cd8bcc38..5c4ee70d5cf3 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -40,8 +40,7 @@
  * Heinz Mauelshagen <mge@sistina.com>, Feb 2002
  *
  * Support for falling back on the write file operation when the address space
- * operations prepare_write and/or commit_write are not available on the
- * backing filesystem.
+ * operations write_begin is not available on the backing filesystem.
  * Anton Altaparmakov, 16 Feb 2005
  *
  * Still To Fix:
@@ -765,7 +764,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
                  */
                 if (!file->f_op->splice_read)
                         goto out_putf;
-                if (aops->prepare_write || aops->write_begin)
+                if (aops->write_begin)
                         lo_flags |= LO_FLAGS_USE_AOPS;
                 if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)
                         lo_flags |= LO_FLAGS_READ_ONLY;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index e6ee21d99d92..b0e569ba730d 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -867,7 +867,7 @@ static int bluecard_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = bluecard_interrupt;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 32f3a8ed8d3d..b936d8ce2728 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -443,8 +443,8 @@ static void bpa10x_destruct(struct hci_dev *hdev)
 
         BT_DBG("%s", hdev->name);
 
-        kfree(data->rx_skb[0]);
-        kfree(data->rx_skb[1]);
+        kfree_skb(data->rx_skb[0]);
+        kfree_skb(data->rx_skb[1]);
         kfree(data);
 }
 
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2cbe70b66470..b3e4d07a4ac2 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
         bt3c_info_t *info = dev_inst;
         unsigned int iobase;
         int iir;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 
                         outb(iir, iobase + CONTROL);
                 }
+                r = IRQ_HANDLED;
         }
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = bt3c_interrupt;
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 58630cc1eff2..cda6c7cc944b 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -152,7 +152,7 @@ static int btsdio_rx_packet(struct btsdio_data *data)
 
         err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
         if (err < 0) {
-                kfree(skb);
+                kfree_skb(skb);
                 return err;
         }
 
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 8e556b7ff9f6..efd689a062eb 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -293,6 +293,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
         unsigned int iobase;
         int boguscount = 0;
         int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -302,6 +303,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
         iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         while (iir) {
+                r = IRQ_HANDLED;
 
                 /* Clear interrupt */
                 lsr = inb(iobase + UART_LSR);
@@ -335,7 +337,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -586,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = btuart_interrupt;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e6e6b037695a..901bdd95655f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -297,6 +297,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
         unsigned char msr;
         int boguscount = 0;
         int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
 
         BUG_ON(!info->hdev);
 
@@ -307,6 +308,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
         iir = inb(iobase + UART_IIR) & UART_IIR_ID;
         while (iir) {
 
+                r = IRQ_HANDLED;
                 /* Clear interrupt */
                 lsr = inb(iobase + UART_LSR);
 
@@ -343,11 +345,12 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
                 info->ri_latch = msr & UART_MSR_RI;
                 clear_bit(XMIT_WAITING, &(info->tx_state));
                 dtl1_write_wakeup(info);
+                r = IRQ_HANDLED;
         }
 
         spin_unlock(&(info->lock));
 
-        return IRQ_HANDLED;
+        return r;
 }
 
 
@@ -568,7 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link)
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
         link->irq.IRQInfo1 = IRQ_LEVEL_ID;
 
         link->irq.Handler = dtl1_interrupt;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 9aaa86b232b1..2eecb779437b 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -495,9 +495,10 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
         return cdrom_open(gd.cd_info, bdev, mode);
 }
 
-static int gdrom_bdops_release(struct block_device *bdev, fmode_t mode)
+static int gdrom_bdops_release(struct gendisk *disk, fmode_t mode)
 {
-        return cdrom_release(gd.cd_info, mode);
+        cdrom_release(gd.cd_info, mode);
+        return 0;
 }
 
 static int gdrom_bdops_mediachanged(struct gendisk *disk)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 122254155ae1..43b35d0369d6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -812,28 +812,6 @@ config JS_RTC
           To compile this driver as a module, choose M here: the
           module will be called js-rtc.
 
-config SGI_DS1286
-        tristate "SGI DS1286 RTC support"
-        depends on SGI_HAS_DS1286
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-
-config SGI_IP27_RTC
-        bool "SGI M48T35 RTC support"
-        depends on SGI_IP27
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-
 config GEN_RTC
         tristate "Generic /dev/rtc emulation"
         depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1a4247dccac4..438f71317c5c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -74,8 +74,6 @@ obj-$(CONFIG_RTC)		+= rtc.o
 obj-$(CONFIG_HPET)              += hpet.o
 obj-$(CONFIG_GEN_RTC)           += genrtc.o
 obj-$(CONFIG_EFI_RTC)           += efirtc.o
-obj-$(CONFIG_SGI_DS1286)        += ds1286.o
-obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
 obj-$(CONFIG_DS1302)            += ds1302.o
 obj-$(CONFIG_XILINX_HWICAP)     += xilinx_hwicap/
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
deleted file mode 100644
index 0a826d7be10e..000000000000
--- a/drivers/char/ds1286.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * DS1286 Real Time Clock interface for Linux
- *
- * Copyright (C) 1998, 1999, 2000 Ralf Baechle
- *
- * Based on code written by Paul Gortmaker.
- *
- * This driver allows use of the real time clock (built into nearly all
- * computers) from user space. It exports the /dev/rtc interface supporting
- * various ioctl() and also the /proc/rtc pseudo-file for status
- * information.
- *
- * The ioctls can be used to set the interrupt behaviour and generation rate
- * from the RTC via IRQ 8. Then the /dev/rtc interface can be used to make
- * use of these timer interrupts, be they interval or alarm based.
- *
- * The /dev/rtc interface will block on reads until an interrupt has been
- * received. If a RTC interrupt has already happened, it will output an
- * unsigned long and then block. The output value contains the interrupt
- * status in the low byte and the number of interrupts since the last read
- * in the remaining high bytes. The /dev/rtc interface can also be used with
- * the select(2) call.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-#include <linux/ds1286.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/rtc.h>
-#include <linux/spinlock.h>
-#include <linux/bcd.h>
-#include <linux/proc_fs.h>
-#include <linux/jiffies.h>
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#define DS1286_VERSION          "1.0"
-
-/*
- *      We sponge a minor off of the misc major. No need slurping
- *      up another valuable major dev number for this. If you add
- *      an ioctl, make sure you don't conflict with SPARC's RTC
- *      ioctls.
- */
-
-static DECLARE_WAIT_QUEUE_HEAD(ds1286_wait);
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                        size_t count, loff_t *ppos);
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg);
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait);
-
-static void ds1286_get_alm_time (struct rtc_time *alm_tm);
-static void ds1286_get_time(struct rtc_time *rtc_tm);
-static int ds1286_set_time(struct rtc_time *rtc_tm);
-
-static inline unsigned char ds1286_is_updating(void);
-
-static DEFINE_SPINLOCK(ds1286_lock);
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
-
-/*
- *      Bits in rtc_status. (7 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-
-static unsigned char ds1286_status;     /* bitmapped status byte.       */
-
-static unsigned char days_in_mo[] = {
-        0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-/*
- *      Now all the various file operations that we export.
- */
-
-static ssize_t ds1286_read(struct file *file, char *buf,
-                           size_t count, loff_t *ppos)
-{
-        return -EIO;
-}
-
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct rtc_time wtime;
-
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* Mask alarm int. enab. bit    */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |=  RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_AIE_ON:        /* Allow alarm interrupts.      */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &=  ~RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_WIE_OFF:       /* Mask watchdog int. enab. bit */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |= RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_WIE_ON:        /* Allow watchdog interrupts.   */
-        {
-                unsigned long flags;
-                unsigned char val;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &= ~RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-
-                return 0;
-        }
-        case RTC_ALM_READ:      /* Read the present alarm time */
-        {
-                /*
-                 * This returns a struct rtc_time. Reading >= 0xc0
-                 * means "don't care" or "match all". Only the tm_hour,
-                 * tm_min, and tm_sec values are filled in.
-                 */
-
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_alm_time(&wtime);
-                break;
-        }
-        case RTC_ALM_SET:       /* Store a time into the alarm */
-        {
-                /*
-                 * This expects a struct rtc_time. Writing 0xff means
-                 * "don't care" or "match all". Only the tm_hour,
-                 * tm_min and tm_sec are used.
-                 */
-                unsigned char hrs, min, sec;
-                struct rtc_time alm_tm;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&alm_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                hrs = alm_tm.tm_hour;
-                min = alm_tm.tm_min;
-                sec = alm_tm.tm_sec;
-
-                if (hrs >= 24)
-                        hrs = 0xff;
-
-                if (min >= 60)
-                        min = 0xff;
-
-                if (sec != 0)
-                        return -EINVAL;
-
-                min = bin2bcd(min);
-                min = bin2bcd(hrs);
-
-                spin_lock(&ds1286_lock);
-                rtc_write(hrs, RTC_HOURS_ALARM);
-                rtc_write(min, RTC_MINUTES_ALARM);
-                spin_unlock(&ds1286_lock);
-
-                return 0;
-        }
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                return ds1286_set_time(&rtc_tm);
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-
-static int ds1286_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&ds1286_lock);
-
-        if (ds1286_status & RTC_IS_OPEN)
-                goto out_busy;
-
-        ds1286_status |= RTC_IS_OPEN;
-
-        spin_unlock_irq(&ds1286_lock);
-        unlock_kernel();
-        return 0;
-
-out_busy:
-        spin_lock_irq(&ds1286_lock);
-        unlock_kernel();
-        return -EBUSY;
-}
-
-static int ds1286_release(struct inode *inode, struct file *file)
-{
-        ds1286_status &= ~RTC_IS_OPEN;
-
-        return 0;
-}
-
-static unsigned int ds1286_poll(struct file *file, poll_table *wait)
-{
-        poll_wait(file, &ds1286_wait, wait);
-
-        return 0;
-}
-
-/*
- *      The various file operations we support.
- */
-
-static const struct file_operations ds1286_fops = {
-        .llseek         = no_llseek,
-        .read           = ds1286_read,
-        .poll           = ds1286_poll,
-        .ioctl          = ds1286_ioctl,
-        .open           = ds1286_open,
-        .release        = ds1286_release,
-};
-
-static struct miscdevice ds1286_dev=
-{
-        .minor  = RTC_MINOR,
-        .name   = "rtc",
-        .fops   = &ds1286_fops,
-};
-
-static int __init ds1286_init(void)
-{
-        int err;
-
-        printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
-
-        err = misc_register(&ds1286_dev);
-        if (err)
-                goto out;
-
-        if (!create_proc_read_entry("driver/rtc", 0, 0, ds1286_read_proc, NULL)) {
-                err = -ENOMEM;
-
-                goto out_deregister;
-        }
-
-        return 0;
-
-out_deregister:
-        misc_deregister(&ds1286_dev);
-
-out:
-        return err;
-}
-
-static void __exit ds1286_exit(void)
-{
-        remove_proc_entry("driver/rtc", NULL);
-        misc_deregister(&ds1286_dev);
-}
-
-static char *days[] = {
-        "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-/*
- *      Info exported via "/proc/rtc".
- */
-static int ds1286_proc_output(char *buf)
-{
-        char *p, *s;
-        struct rtc_time tm;
-        unsigned char hundredth, month, cmd, amode;
-
-        p = buf;
-
-        ds1286_get_time(&tm);
-        hundredth = rtc_read(RTC_HUNDREDTH_SECOND);
-        hundredth = bcd2bin(hundredth);
-
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d.%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec, hundredth,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-
-        /*
-         * We implicitly assume 24hr mode here. Alarm values >= 0xc0 will
-         * match any value for that particular field. Values that are
-         * greater than a valid time, but less than 0xc0 shouldn't appear.
-         */
-        ds1286_get_alm_time(&tm);
-        p += sprintf(p, "alarm\t\t: %s ", days[tm.tm_wday]);
-        if (tm.tm_hour <= 24)
-                p += sprintf(p, "%02d:", tm.tm_hour);
-        else
-                p += sprintf(p, "**:");
-
-        if (tm.tm_min <= 59)
-                p += sprintf(p, "%02d\n", tm.tm_min);
-        else
-                p += sprintf(p, "**\n");
-
-        month = rtc_read(RTC_MONTH);
-        p += sprintf(p,
-                     "oscillator\t: %s\n"
-                     "square_wave\t: %s\n",
-                     (month & RTC_EOSC) ? "disabled" : "enabled",
-                     (month & RTC_ESQW) ? "disabled" : "enabled");
-
-        amode = ((rtc_read(RTC_MINUTES_ALARM) & 0x80) >> 5) |
-                ((rtc_read(RTC_HOURS_ALARM) & 0x80) >> 6) |
-                ((rtc_read(RTC_DAY_ALARM) & 0x80) >> 7);
-        if (amode == 7)      s = "each minute";
-        else if (amode == 3) s = "minutes match";
-        else if (amode == 1) s = "hours and minutes match";
-        else if (amode == 0) s = "days, hours and minutes match";
-        else                 s = "invalid";
-        p += sprintf(p, "alarm_mode\t: %s\n", s);
-
-        cmd = rtc_read(RTC_CMD);
-        p += sprintf(p,
-                     "alarm_enable\t: %s\n"
-                     "wdog_alarm\t: %s\n"
-                     "alarm_mask\t: %s\n"
-                     "wdog_alarm_mask\t: %s\n"
-                     "interrupt_mode\t: %s\n"
-                     "INTB_mode\t: %s_active\n"
-                     "interrupt_pins\t: %s\n",
-                     (cmd & RTC_TDF) ? "yes" : "no",
-                     (cmd & RTC_WAF) ? "yes" : "no",
-                     (cmd & RTC_TDM) ? "disabled" : "enabled",
-                     (cmd & RTC_WAM) ? "disabled" : "enabled",
-                     (cmd & RTC_PU_LVL) ? "pulse" : "level",
-                     (cmd & RTC_IBH_LO) ? "low" : "high",
-                     (cmd & RTC_IPSW) ? "unswapped" : "swapped");
-
-        return  p - buf;
-}
-
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data)
-{
-        int len = ds1286_proc_output (page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count)
-                len = count;
-        if (len<0)
-                len = 0;
-
-        return len;
-}
-
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char ds1286_is_updating(void)
-{
-        return rtc_read(RTC_CMD) & RTC_TE;
-}
-
-
-static void ds1286_get_time(struct rtc_time *rtc_tm)
-{
-        unsigned char save_control;
-        unsigned long flags;
-
-        /*
-         * read RTC once any update in progress is done. The update
-         * can take just over 2ms. We wait 10 to 20ms. There is no need to
-         * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
-         * If you need to know *exactly* when a second has started, enable
-         * periodic update complete interrupts, (via ioctl) and then
-         * immediately read /dev/rtc which will block until you get the IRQ.
-         * Once the read clears, read the RTC time (again via ioctl). Easy.
-         */
-
-        if (ds1286_is_updating() != 0)
-                msleep(20);
-
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-
-        rtc_tm->tm_sec = rtc_read(RTC_SECONDS);
-        rtc_tm->tm_min = rtc_read(RTC_MINUTES);
-        rtc_tm->tm_hour = rtc_read(RTC_HOURS) & 0x3f;
-        rtc_tm->tm_mday = rtc_read(RTC_DATE);
-        rtc_tm->tm_mon = rtc_read(RTC_MONTH) & 0x1f;
-        rtc_tm->tm_year = rtc_read(RTC_YEAR);
-
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if (rtc_tm->tm_year < 45)
-                rtc_tm->tm_year += 30;
-        if ((rtc_tm->tm_year += 40) < 70)
-                rtc_tm->tm_year += 100;
-
-        rtc_tm->tm_mon--;
-}
-
-static int ds1286_set_time(struct rtc_time *rtc_tm)
-{
-        unsigned char mon, day, hrs, min, sec, leap_yr;
-        unsigned char save_control;
-        unsigned int yrs;
-        unsigned long flags;
-
-
-        yrs = rtc_tm->tm_year + 1900;
-        mon = rtc_tm->tm_mon + 1;   /* tm_mon starts at zero */
-        day = rtc_tm->tm_mday;
-        hrs = rtc_tm->tm_hour;
-        min = rtc_tm->tm_min;
-        sec = rtc_tm->tm_sec;
-
-        if (yrs < 1970)
-                return -EINVAL;
-
-        leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-        if ((mon > 12) || (day == 0))
-                return -EINVAL;
-
-        if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                return -EINVAL;
-
-        if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                return -EINVAL;
-
-        if ((yrs -= 1940) > 255)    /* They are unsigned */
-                return -EINVAL;
-
-        if (yrs >= 100)
-                yrs -= 100;
-
-        sec = bin2bcd(sec);
-        min = bin2bcd(min);
-        hrs = bin2bcd(hrs);
-        day = bin2bcd(day);
-        mon = bin2bcd(mon);
-        yrs = bin2bcd(yrs);
-
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-
-        rtc_write(yrs, RTC_YEAR);
-        rtc_write(mon, RTC_MONTH);
-        rtc_write(day, RTC_DATE);
-        rtc_write(hrs, RTC_HOURS);
-        rtc_write(min, RTC_MINUTES);
-        rtc_write(sec, RTC_SECONDS);
-        rtc_write(0, RTC_HUNDREDTH_SECOND);
-
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        return 0;
-}
-
-static void ds1286_get_alm_time(struct rtc_time *alm_tm)
-{
-        unsigned char cmd;
-        unsigned long flags;
-
-        /*
-         * Only the values that we read from the RTC are set. That
-         * means only tm_wday, tm_hour, tm_min.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        alm_tm->tm_min = rtc_read(RTC_MINUTES_ALARM) & 0x7f;
-        alm_tm->tm_hour = rtc_read(RTC_HOURS_ALARM)  & 0x1f;
-        alm_tm->tm_wday = rtc_read(RTC_DAY_ALARM)    & 0x07;
-        cmd = rtc_read(RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-
-        alm_tm->tm_min = bcd2bin(alm_tm->tm_min);
-        alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour);
-        alm_tm->tm_sec = 0;
-}
-
-module_init(ds1286_init);
-module_exit(ds1286_exit);
-
-MODULE_AUTHOR("Ralf Baechle");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 408f5f92cb4e..53fdc7ff3870 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -427,9 +427,6 @@ static int hpet_release(struct inode *inode, struct file *file)
         if (irq)
                 free_irq(irq, devp);
 
-        if (file->f_flags & FASYNC)
-                hpet_fasync(-1, file, 0);
-
         file->private_data = NULL;
         return 0;
 }
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index c422e870dc52..cd0ba51f7c80 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *
diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
index fed4ef5569f5..64d513f68368 100644
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
index 8a2fce0756ec..5dcbe603eca2 100644
--- a/drivers/char/hw_random/intel-rng.c
+++ b/drivers/char/hw_random/intel-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *
diff --git a/drivers/char/hw_random/via-rng.c b/drivers/char/hw_random/via-rng.c
index 128202e18fc9..4e9573c1d39e 100644
--- a/drivers/char/hw_random/via-rng.c
+++ b/drivers/char/hw_random/via-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
+ * (c) Copyright 2001 Red Hat Inc
  *
  * derived from
  *
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c
deleted file mode 100644
index 2abd881b4cbc..000000000000
--- a/drivers/char/ip27-rtc.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- *      Driver for the SGS-Thomson M48T35 Timekeeper RAM chip
- *
- *      Real Time Clock interface for Linux
- *
- *      TODO: Implement periodic interrupts.
- *
- *      Copyright (C) 2000 Silicon Graphics, Inc.
- *      Written by Ulf Carlsson (ulfc@engr.sgi.com)
- *
- *      Based on code written by Paul Gortmaker.
- *
- *      This driver allows use of the real time clock (built into
- *      nearly all computers) from user space. It exports the /dev/rtc
- *      interface supporting various ioctl() and also the /proc/rtc
- *      pseudo-file for status information.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- */
-
-#define RTC_VERSION             "1.09b"
-
-#include <linux/bcd.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-
-#include <asm/m48t35.h>
-#include <asm/sn/ioc3.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/sn/klconfig.h>
-#include <asm/sn/sn0/ip27.h>
-#include <asm/sn/sn0/hub.h>
-#include <asm/sn/sn_private.h>
-
-static long rtc_ioctl(struct file *filp, unsigned int cmd,
-                        unsigned long arg);
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data);
-
-static void get_rtc_time(struct rtc_time *rtc_tm);
-
-/*
- *      Bits in rtc_status. (6 bits of room for future expansion)
- */
-
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-
-static unsigned char rtc_status;        /* bitmapped status byte.       */
-static unsigned long rtc_freq;  /* Current periodic IRQ rate    */
-static struct m48t35_rtc *rtc;
-
-/*
- *      If this driver ever becomes modularised, it will be really nice
- *      to make the epoch retain its value across module reload...
- */
-
-static unsigned long epoch = 1970;      /* year corresponding to 0x00   */
-
-static const unsigned char days_in_mo[] =
-{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-
-        struct rtc_time wtime;
-
-        switch (cmd) {
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                get_rtc_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-                unsigned char mon, day, hrs, min, sec, leap_yr;
-                unsigned int yrs;
-
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-
-                yrs = rtc_tm.tm_year + 1900;
-                mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
-                day = rtc_tm.tm_mday;
-                hrs = rtc_tm.tm_hour;
-                min = rtc_tm.tm_min;
-                sec = rtc_tm.tm_sec;
-
-                if (yrs < 1970)
-                        return -EINVAL;
-
-                leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-
-                if ((mon > 12) || (day == 0))
-                        return -EINVAL;
-
-                if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                        return -EINVAL;
-
-                if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                        return -EINVAL;
-
-                if ((yrs -= epoch) > 255)    /* They are unsigned */
-                        return -EINVAL;
-
-                if (yrs > 169)
-                        return -EINVAL;
-
-                if (yrs >= 100)
-                        yrs -= 100;
-
-                sec = bin2bcd(sec);
-                min = bin2bcd(min);
-                hrs = bin2bcd(hrs);
-                day = bin2bcd(day);
-                mon = bin2bcd(mon);
-                yrs = bin2bcd(yrs);
-
-                spin_lock_irq(&rtc_lock);
-                rtc->control |= M48T35_RTC_SET;
-                rtc->year = yrs;
-                rtc->month = mon;
-                rtc->date = day;
-                rtc->hour = hrs;
-                rtc->min = min;
-                rtc->sec = sec;
-                rtc->control &= ~M48T35_RTC_SET;
-                spin_unlock_irq(&rtc_lock);
-
-                return 0;
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-
-static int rtc_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&rtc_lock);
-
-        if (rtc_status & RTC_IS_OPEN) {
-                spin_unlock_irq(&rtc_lock);
-                unlock_kernel();
-                return -EBUSY;
-        }
-
-        rtc_status |= RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-        unlock_kernel();
-
-        return 0;
-}
-
-static int rtc_release(struct inode *inode, struct file *file)
-{
-        /*
-         * Turn off all interrupts once the device is no longer
-         * in use, and clear the data.
-         */
-
-        spin_lock_irq(&rtc_lock);
-        rtc_status &= ~RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-
-        return 0;
-}
-
-/*
- *      The various file operations we support.
- */
-
-static const struct file_operations rtc_fops = {
-        .owner          = THIS_MODULE,
-        .unlocked_ioctl = rtc_ioctl,
-        .open           = rtc_open,
-        .release        = rtc_release,
-};
-
-static struct miscdevice rtc_dev=
-{
-        RTC_MINOR,
-        "rtc",
-        &rtc_fops
-};
-
-static int __init rtc_init(void)
-{
-        rtc = (struct m48t35_rtc *)
-        (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0);
-
-        printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
-        if (misc_register(&rtc_dev)) {
-                printk(KERN_ERR "rtc: cannot register misc device.\n");
-                return -ENODEV;
-        }
-        if (!create_proc_read_entry("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
-                printk(KERN_ERR "rtc: cannot create /proc/rtc.\n");
-                misc_deregister(&rtc_dev);
-                return -ENOENT;
-        }
-
-        rtc_freq = 1024;
-
-        return 0;
-}
-
-static void __exit rtc_exit (void)
-{
-        /* interrupts and timer disabled at this point by rtc_release */
-
-        remove_proc_entry ("rtc", NULL);
-        misc_deregister(&rtc_dev);
-}
-
-module_init(rtc_init);
-module_exit(rtc_exit);
-
-/*
- *      Info exported via "/proc/rtc".
- */
-
-static int rtc_get_status(char *buf)
-{
-        char *p;
-        struct rtc_time tm;
-
-        /*
-         * Just emulate the standard /proc/rtc
-         */
-
-        p = buf;
-
-        get_rtc_time(&tm);
-
-        /*
-         * There is no way to tell if the luser has the RTC set for local
-         * time or for Universal Standard Time (GMT). Probably local though.
-         */
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n"
-                     "rtc_epoch\t: %04lu\n"
-                     "24hr\t\t: yes\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch);
-
-        return  p - buf;
-}
-
-static int rtc_read_proc(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
-{
-        int len = rtc_get_status(page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count) len = count;
-        if (len<0) len = 0;
-        return len;
-}
-
-static void get_rtc_time(struct rtc_time *rtc_tm)
-{
-        /*
-         * Do we need to wait for the last update to finish?
-         */
-
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irq(&rtc_lock);
-        rtc->control |= M48T35_RTC_READ;
-        rtc_tm->tm_sec = rtc->sec;
-        rtc_tm->tm_min = rtc->min;
-        rtc_tm->tm_hour = rtc->hour;
-        rtc_tm->tm_mday = rtc->date;
-        rtc_tm->tm_mon = rtc->month;
-        rtc_tm->tm_year = rtc->year;
-        rtc->control &= ~M48T35_RTC_READ;
-        spin_unlock_irq(&rtc_lock);
-
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
-                rtc_tm->tm_year += 100;
-
-        rtc_tm->tm_mon--;
-}
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 835a33c8d5f5..41fc11dc921c 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -162,8 +162,6 @@ static int ipmi_release(struct inode *inode, struct file *file)
         if (rv)
                 return rv;
 
-        ipmi_fasync (-1, file, 0);
-
         /* FIXME - free the messages in the list. */
         kfree(priv);
 
@@ -957,3 +955,4 @@ module_exit(cleanup_ipmi);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
 MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");
+MODULE_ALIAS("platform:ipmi_si");
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 235fab0bdf79..a4d57e31f713 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -870,7 +870,6 @@ static int ipmi_close(struct inode *ino, struct file *filep)
                 clear_bit(0, &ipmi_wdog_open);
         }
 
-        ipmi_fasync(-1, filep, 0);
         expect_close = 0;
 
         return 0;
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 7d30ee1d3fca..04e4549299ba 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -7,12 +7,14 @@
  *      Original driver code supplied by Multi-Tech
  *
  *      Changes
- *      1/9/98  alan@redhat.com         Merge to 2.0.x kernel tree
+ *      1/9/98  alan@lxorguk.ukuu.org.uk
+ *                                      Merge to 2.0.x kernel tree
  *                                      Obtain and use official major/minors
  *                                      Loader switched to a misc device
  *                                      (fixed range check bug as a side effect)
  *                                      Printk clean up
- *      9/12/98 alan@redhat.com         Rough port to 2.1.x
+ *      9/12/98 alan@lxorguk.ukuu.org.uk
+ *                                      Rough port to 2.1.x
  *
  *      10/6/99 sameer                  Merged the ISA and PCI drivers to
  *                                      a new unified driver.
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 8beef50f95a0..047766915411 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -14,7 +14,8 @@
  *      (at your option) any later version.
  *
  *      Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox
- *      <alan@redhat.com>. The original 1.8 code is available on www.moxa.com.
+ *      <alan@lxorguk.ukuu.org.uk>. The original 1.8 code is available on
+ *      www.moxa.com.
  *      - Fixed x86_64 cleanness
  */
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9a626e50b793..4d64a02612a4 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
     /* Initialize the struct pcmcia_device structure */
 
     /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1   = IRQ_LEVEL_ID;
     link->irq.Handler = NULL;
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 705a839f1796..675076f5fca8 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1139,18 +1139,12 @@ static int random_fasync(int fd, struct file *filp, int on)
         return fasync_helper(fd, filp, on, &fasync);
 }
 
-static int random_release(struct inode *inode, struct file *filp)
-{
-        return fasync_helper(-1, filp, 0, &fasync);
-}
-
 const struct file_operations random_fops = {
         .read  = random_read,
         .write = random_write,
         .poll  = random_poll,
         .unlocked_ioctl = random_ioctl,
         .fasync = random_fasync,
-        .release = random_release,
 };
 
 const struct file_operations urandom_fops = {
@@ -1158,7 +1152,6 @@ const struct file_operations urandom_fops = {
         .write = random_write,
         .unlocked_ioctl = random_ioctl,
         .fasync = random_fasync,
-        .release = random_release,
 };
 
 /***************************************************************
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 32dc89720d58..20d6efb6324e 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -788,8 +788,6 @@ static int rtc_release(struct inode *inode, struct file *file)
         }
         spin_unlock_irq(&rtc_lock);
 
-        if (file->f_flags & FASYNC)
-                rtc_fasync(-1, file, 0);
 no_irq:
 #endif
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 85e0eb76eeab..2457b07dabd6 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -898,7 +898,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)
 {
-        sonypi_misc_fasync(-1, file, 0);
         mutex_lock(&sonypi_device.lock);
         sonypi_device.open_count--;
         mutex_unlock(&sonypi_device.lock);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index d8f83e26e4a4..a5af6072e2b3 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -1644,7 +1644,10 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
         vc->vc_tab_stop[1]      =
         vc->vc_tab_stop[2]      =
         vc->vc_tab_stop[3]      =
-        vc->vc_tab_stop[4]      = 0x01010101;
+        vc->vc_tab_stop[4]      =
+        vc->vc_tab_stop[5]      =
+        vc->vc_tab_stop[6]      =
+        vc->vc_tab_stop[7]      = 0x01010101;
 
         vc->vc_bell_pitch = DEFAULT_BELL_PITCH;
         vc->vc_bell_duration = DEFAULT_BELL_DURATION;
@@ -1935,7 +1938,10 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                                         vc->vc_tab_stop[1] =
                                         vc->vc_tab_stop[2] =
                                         vc->vc_tab_stop[3] =
-                                        vc->vc_tab_stop[4] = 0;
+                                        vc->vc_tab_stop[4] =
+                                        vc->vc_tab_stop[5] =
+                                        vc->vc_tab_stop[6] =
+                                        vc->vc_tab_stop[7] = 0;
                         }
                         return;
                 case 'm':
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 5bed73329ef8..8504a2108557 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -65,12 +65,14 @@ static void cpuidle_idle_call(void)
                 return;
         }
 
+#if 0
+        /* shows regressions, re-enable for 2.6.29 */
         /*
          * run any timers that can be run now, at this point
          * before calculating the idle duration etc.
          */
         hrtimer_peek_ahead_timers();
-
+#endif
         /* ask the governor for the next state */
         next_state = cpuidle_curr_governor->select(dev);
         if (need_resched())
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c
index ec249d2db633..d883e1b8bb8c 100644
--- a/drivers/dca/dca-core.c
+++ b/drivers/dca/dca-core.c
@@ -270,6 +270,6 @@ static void __exit dca_exit(void)
         dca_sysfs_exit();
 }
 
-module_init(dca_init);
+subsys_initcall(dca_init);
 module_exit(dca_exit);
 
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 43b8cefad2c6..ecd743f7cc61 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -33,6 +33,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
+#include <linux/i7300_idle.h>
 #include "ioatdma.h"
 #include "ioatdma_registers.h"
 #include "ioatdma_hw.h"
@@ -171,8 +172,10 @@ static int ioat_dma_enumerate_channels(struct ioatdma_device *device)
         xfercap_scale = readb(device->reg_base + IOAT_XFERCAP_OFFSET);
         xfercap = (xfercap_scale == 0 ? -1 : (1UL << xfercap_scale));
 
-#if CONFIG_I7300_IDLE_IOAT_CHANNEL
-        device->common.chancnt--;
+#ifdef  CONFIG_I7300_IDLE_IOAT_CHANNEL
+        if (i7300_idle_platform_probe(NULL, NULL) == 0) {
+                device->common.chancnt--;
+        }
 #endif
         for (i = 0; i < device->common.chancnt; i++) {
                 ioat_chan = kzalloc(sizeof(*ioat_chan), GFP_KERNEL);
@@ -522,7 +525,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx)
         }
 
         hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
-        if (new->async_tx.callback) {
+        if (first->async_tx.callback) {
                 hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;
                 if (first != new) {
                         /* move callback into to last desc */
@@ -614,7 +617,7 @@ static dma_cookie_t ioat2_tx_submit(struct dma_async_tx_descriptor *tx)
         }
 
         hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_CP_STS;
-        if (new->async_tx.callback) {
+        if (first->async_tx.callback) {
                 hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;
                 if (first != new) {
                         /* move callback into to last desc */
@@ -804,6 +807,12 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
         struct ioat_desc_sw *desc, *_desc;
         int in_use_descs = 0;
 
+        /* Before freeing channel resources first check
+         * if they have been previously allocated for this channel.
+         */
+        if (ioat_chan->desccount == 0)
+                return;
+
         tasklet_disable(&ioat_chan->cleanup_task);
         ioat_dma_memcpy_cleanup(ioat_chan);
 
@@ -866,6 +875,7 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
         ioat_chan->last_completion = ioat_chan->completion_addr = 0;
         ioat_chan->pending = 0;
         ioat_chan->dmacount = 0;
+        ioat_chan->desccount = 0;
         ioat_chan->watchdog_completion = 0;
         ioat_chan->last_compl_desc_addr_hw = 0;
         ioat_chan->watchdog_tcp_cookie =
diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c
index e763d723e4cf..9f6fe46a9b87 100644
--- a/drivers/dma/iovlock.c
+++ b/drivers/dma/iovlock.c
@@ -55,7 +55,6 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)
         int nr_iovecs = 0;
         int iovec_len_used = 0;
         int iovec_pages_used = 0;
-        long err;
 
         /* don't pin down non-user-based iovecs */
         if (segment_eq(get_fs(), KERNEL_DS))
@@ -72,23 +71,21 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)
         local_list = kmalloc(sizeof(*local_list)
                 + (nr_iovecs * sizeof (struct dma_page_list))
                 + (iovec_pages_used * sizeof (struct page*)), GFP_KERNEL);
-        if (!local_list) {
-                err = -ENOMEM;
+        if (!local_list)
                 goto out;
-        }
 
         /* list of pages starts right after the page list array */
         pages = (struct page **) &local_list->page_list[nr_iovecs];
 
+        local_list->nr_iovecs = 0;
+
         for (i = 0; i < nr_iovecs; i++) {
                 struct dma_page_list *page_list = &local_list->page_list[i];
 
                 len -= iov[i].iov_len;
 
-                if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len)) {
-                        err = -EFAULT;
+                if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len))
                         goto unpin;
-                }
 
                 page_list->nr_pages = num_pages_spanned(&iov[i]);
                 page_list->base_address = iov[i].iov_base;
@@ -109,10 +106,8 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)
                         NULL);
                 up_read(&current->mm->mmap_sem);
 
-                if (ret != page_list->nr_pages) {
-                        err = -ENOMEM;
+                if (ret != page_list->nr_pages)
                         goto unpin;
-                }
 
                 local_list->nr_iovecs = i + 1;
         }
@@ -122,7 +117,7 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)
 unpin:
         dma_unpin_iovec_pages(local_list);
 out:
-        return ERR_PTR(err);
+        return NULL;
 }
 
 void dma_unpin_iovec_pages(struct dma_pinned_list *pinned_list)
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 5a11e3cbcae2..e0dbd388757f 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -102,6 +102,13 @@ config EDAC_I3000
           Support for error detection and correction on the Intel
           3000 and 3010 server chipsets.
 
+config EDAC_X38
+        tristate "Intel X38"
+        depends on EDAC_MM_EDAC && PCI && X86
+        help
+          Support for error detection and correction on the Intel
+          X38 server chipsets.
+
 config EDAC_I82860
         tristate "Intel 82860"
         depends on EDAC_MM_EDAC && PCI && X86_32
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index e5e9104b5520..62c2d9bad8dc 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_EDAC_I82443BXGX)		+= i82443bxgx_edac.o
 obj-$(CONFIG_EDAC_I82875P)              += i82875p_edac.o
 obj-$(CONFIG_EDAC_I82975X)              += i82975x_edac.o
 obj-$(CONFIG_EDAC_I3000)                += i3000_edac.o
+obj-$(CONFIG_EDAC_X38)                  += x38_edac.o
 obj-$(CONFIG_EDAC_I82860)               += i82860_edac.o
 obj-$(CONFIG_EDAC_R82600)               += r82600_edac.o
 obj-$(CONFIG_EDAC_PASEMI)               += pasemi_edac.o
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 887072f5dc8b..cd2e3b8087e7 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -9,6 +9,7 @@
  */
 #undef DEBUG
 
+#include <linux/edac.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -164,6 +165,8 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
         if (regs == NULL)
                 return -ENODEV;
 
+        edac_op_state = EDAC_OPSTATE_POLL;
+
         /* Get channel population */
         reg = in_be64(&regs->mic_mnt_cfg);
         dev_dbg(&pdev->dev, "MIC_MNT_CFG = 0x%016lx\n", reg);
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
new file mode 100644
index 000000000000..2406c2ce2844
--- /dev/null
+++ b/drivers/edac/x38_edac.c
@@ -0,0 +1,524 @@
+/*
+ * Intel X38 Memory Controller kernel module
+ * Copyright (C) 2008 Cluster Computing, Inc.
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License.
+ *
+ * This file is based on i3200_edac.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <linux/edac.h>
+#include "edac_core.h"
+
+#define X38_REVISION            "1.1"
+
+#define EDAC_MOD_STR            "x38_edac"
+
+#define PCI_DEVICE_ID_INTEL_X38_HB      0x29e0
+
+#define X38_RANKS               8
+#define X38_RANKS_PER_CHANNEL   4
+#define X38_CHANNELS            2
+
+/* Intel X38 register addresses - device 0 function 0 - DRAM Controller */
+
+#define X38_MCHBAR_LOW  0x48    /* MCH Memory Mapped Register BAR */
+#define X38_MCHBAR_HIGH 0x4b
+#define X38_MCHBAR_MASK 0xfffffc000ULL  /* bits 35:14 */
+#define X38_MMR_WINDOW_SIZE     16384
+
+#define X38_TOM 0xa0    /* Top of Memory (16b)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  total populated physical memory
+                                 */
+#define X38_TOM_MASK    0x3ff   /* bits 9:0 */
+#define X38_TOM_SHIFT 26        /* 64MiB grain */
+
+#define X38_ERRSTS      0xc8    /* Error Status Register (16b)
+                                 *
+                                 * 15    reserved
+                                 * 14    Isochronous TBWRR Run Behind FIFO Full
+                                 *       (ITCV)
+                                 * 13    Isochronous TBWRR Run Behind FIFO Put
+                                 *       (ITSTV)
+                                 * 12    reserved
+                                 * 11    MCH Thermal Sensor Event
+                                 *       for SMI/SCI/SERR (GTSE)
+                                 * 10    reserved
+                                 *  9    LOCK to non-DRAM Memory Flag (LCKF)
+                                 *  8    reserved
+                                 *  7    DRAM Throttle Flag (DTF)
+                                 *  6:2  reserved
+                                 *  1    Multi-bit DRAM ECC Error Flag (DMERR)
+                                 *  0    Single-bit DRAM ECC Error Flag (DSERR)
+                                 */
+#define X38_ERRSTS_UE           0x0002
+#define X38_ERRSTS_CE           0x0001
+#define X38_ERRSTS_BITS (X38_ERRSTS_UE | X38_ERRSTS_CE)
+
+
+/* Intel  MMIO register space - device 0 function 0 - MMR space */
+
+#define X38_C0DRB       0x200   /* Channel 0 DRAM Rank Boundary (16b x 4)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  Channel 0 DRAM Rank Boundary Address
+                                 */
+#define X38_C1DRB       0x600   /* Channel 1 DRAM Rank Boundary (16b x 4) */
+#define X38_DRB_MASK    0x3ff   /* bits 9:0 */
+#define X38_DRB_SHIFT 26        /* 64MiB grain */
+
+#define X38_C0ECCERRLOG 0x280   /* Channel 0 ECC Error Log (64b)
+                                 *
+                                 * 63:48 Error Column Address (ERRCOL)
+                                 * 47:32 Error Row Address (ERRROW)
+                                 * 31:29 Error Bank Address (ERRBANK)
+                                 * 28:27 Error Rank Address (ERRRANK)
+                                 * 26:24 reserved
+                                 * 23:16 Error Syndrome (ERRSYND)
+                                 * 15: 2 reserved
+                                 *    1  Multiple Bit Error Status (MERRSTS)
+                                 *    0  Correctable Error Status (CERRSTS)
+                                 */
+#define X38_C1ECCERRLOG 0x680   /* Channel 1 ECC Error Log (64b) */
+#define X38_ECCERRLOG_CE        0x1
+#define X38_ECCERRLOG_UE        0x2
+#define X38_ECCERRLOG_RANK_BITS 0x18000000
+#define X38_ECCERRLOG_SYNDROME_BITS     0xff0000
+
+#define X38_CAPID0 0xe0 /* see P.94 of spec for details */
+
+static int x38_channel_num;
+
+static int how_many_channel(struct pci_dev *pdev)
+{
+        unsigned char capid0_8b; /* 8th byte of CAPID0 */
+
+        pci_read_config_byte(pdev, X38_CAPID0 + 8, &capid0_8b);
+        if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */
+                debugf0("In single channel mode.\n");
+                x38_channel_num = 1;
+        } else {
+                debugf0("In dual channel mode.\n");
+                x38_channel_num = 2;
+        }
+
+        return x38_channel_num;
+}
+
+static unsigned long eccerrlog_syndrome(u64 log)
+{
+        return (log & X38_ECCERRLOG_SYNDROME_BITS) >> 16;
+}
+
+static int eccerrlog_row(int channel, u64 log)
+{
+        return ((log & X38_ECCERRLOG_RANK_BITS) >> 27) |
+                (channel * X38_RANKS_PER_CHANNEL);
+}
+
+enum x38_chips {
+        X38 = 0,
+};
+
+struct x38_dev_info {
+        const char *ctl_name;
+};
+
+struct x38_error_info {
+        u16 errsts;
+        u16 errsts2;
+        u64 eccerrlog[X38_CHANNELS];
+};
+
+static const struct x38_dev_info x38_devs[] = {
+        [X38] = {
+                .ctl_name = "x38"},
+};
+
+static struct pci_dev *mci_pdev;
+static int x38_registered = 1;
+
+
+static void x38_clear_error_info(struct mem_ctl_info *mci)
+{
+        struct pci_dev *pdev;
+
+        pdev = to_pci_dev(mci->dev);
+
+        /*
+         * Clear any error bits.
+         * (Yes, we really clear bits by writing 1 to them.)
+         */
+        pci_write_bits16(pdev, X38_ERRSTS, X38_ERRSTS_BITS,
+                         X38_ERRSTS_BITS);
+}
+
+static u64 x38_readq(const void __iomem *addr)
+{
+        return readl(addr) | (((u64)readl(addr + 4)) << 32);
+}
+
+static void x38_get_and_clear_error_info(struct mem_ctl_info *mci,
+                                 struct x38_error_info *info)
+{
+        struct pci_dev *pdev;
+        void __iomem *window = mci->pvt_info;
+
+        pdev = to_pci_dev(mci->dev);
+
+        /*
+         * This is a mess because there is no atomic way to read all the
+         * registers at once and the registers can transition from CE being
+         * overwritten by UE.
+         */
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts);
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+
+        info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+        if (x38_channel_num == 2)
+                info->eccerrlog[1] = x38_readq(window + X38_C1ECCERRLOG);
+
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts2);
+
+        /*
+         * If the error is the same for both reads then the first set
+         * of reads is valid.  If there is a change then there is a CE
+         * with no info and the second set of reads is valid and
+         * should be UE info.
+         */
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+                if (x38_channel_num == 2)
+                        info->eccerrlog[1] =
+                                x38_readq(window + X38_C1ECCERRLOG);
+        }
+
+        x38_clear_error_info(mci);
+}
+
+static void x38_process_error_info(struct mem_ctl_info *mci,
+                                struct x38_error_info *info)
+{
+        int channel;
+        u64 log;
+
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                edac_mc_handle_ce_no_info(mci, "UE overwrote CE");
+                info->errsts = info->errsts2;
+        }
+
+        for (channel = 0; channel < x38_channel_num; channel++) {
+                log = info->eccerrlog[channel];
+                if (log & X38_ECCERRLOG_UE) {
+                        edac_mc_handle_ue(mci, 0, 0,
+                                eccerrlog_row(channel, log), "x38 UE");
+                } else if (log & X38_ECCERRLOG_CE) {
+                        edac_mc_handle_ce(mci, 0, 0,
+                                eccerrlog_syndrome(log),
+                                eccerrlog_row(channel, log), 0, "x38 CE");
+                }
+        }
+}
+
+static void x38_check(struct mem_ctl_info *mci)
+{
+        struct x38_error_info info;
+
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        x38_get_and_clear_error_info(mci, &info);
+        x38_process_error_info(mci, &info);
+}
+
+
+void __iomem *x38_map_mchbar(struct pci_dev *pdev)
+{
+        union {
+                u64 mchbar;
+                struct {
+                        u32 mchbar_low;
+                        u32 mchbar_high;
+                };
+        } u;
+        void __iomem *window;
+
+        pci_read_config_dword(pdev, X38_MCHBAR_LOW, &u.mchbar_low);
+        pci_write_config_dword(pdev, X38_MCHBAR_LOW, u.mchbar_low | 0x1);
+        pci_read_config_dword(pdev, X38_MCHBAR_HIGH, &u.mchbar_high);
+        u.mchbar &= X38_MCHBAR_MASK;
+
+        if (u.mchbar != (resource_size_t)u.mchbar) {
+                printk(KERN_ERR
+                        "x38: mmio space beyond accessible range (0x%llx)\n",
+                        (unsigned long long)u.mchbar);
+                return NULL;
+        }
+
+        window = ioremap_nocache(u.mchbar, X38_MMR_WINDOW_SIZE);
+        if (!window)
+                printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",
+                        (unsigned long long)u.mchbar);
+
+        return window;
+}
+
+
+static void x38_get_drbs(void __iomem *window,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        int i;
+
+        for (i = 0; i < X38_RANKS_PER_CHANNEL; i++) {
+                drbs[0][i] = readw(window + X38_C0DRB + 2*i) & X38_DRB_MASK;
+                drbs[1][i] = readw(window + X38_C1DRB + 2*i) & X38_DRB_MASK;
+        }
+}
+
+static bool x38_is_stacked(struct pci_dev *pdev,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        u16 tom;
+
+        pci_read_config_word(pdev, X38_TOM, &tom);
+        tom &= X38_TOM_MASK;
+
+        return drbs[X38_CHANNELS - 1][X38_RANKS_PER_CHANNEL - 1] == tom;
+}
+
+static unsigned long drb_to_nr_pages(
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL],
+                        bool stacked, int channel, int rank)
+{
+        int n;
+
+        n = drbs[channel][rank];
+        if (rank > 0)
+                n -= drbs[channel][rank - 1];
+        if (stacked && (channel == 1) && drbs[channel][rank] ==
+                                drbs[channel][X38_RANKS_PER_CHANNEL - 1]) {
+                n -= drbs[0][X38_RANKS_PER_CHANNEL - 1];
+        }
+
+        n <<= (X38_DRB_SHIFT - PAGE_SHIFT);
+        return n;
+}
+
+static int x38_probe1(struct pci_dev *pdev, int dev_idx)
+{
+        int rc;
+        int i;
+        struct mem_ctl_info *mci = NULL;
+        unsigned long last_page;
+        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL];
+        bool stacked;
+        void __iomem *window;
+
+        debugf0("MC: %s()\n", __func__);
+
+        window = x38_map_mchbar(pdev);
+        if (!window)
+                return -ENODEV;
+
+        x38_get_drbs(window, drbs);
+
+        how_many_channel(pdev);
+
+        /* FIXME: unconventional pvt_info usage */
+        mci = edac_mc_alloc(0, X38_RANKS, x38_channel_num, 0);
+        if (!mci)
+                return -ENOMEM;
+
+        debugf3("MC: %s(): init mci\n", __func__);
+
+        mci->dev = &pdev->dev;
+        mci->mtype_cap = MEM_FLAG_DDR2;
+
+        mci->edac_ctl_cap = EDAC_FLAG_SECDED;
+        mci->edac_cap = EDAC_FLAG_SECDED;
+
+        mci->mod_name = EDAC_MOD_STR;
+        mci->mod_ver = X38_REVISION;
+        mci->ctl_name = x38_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
+        mci->edac_check = x38_check;
+        mci->ctl_page_to_phys = NULL;
+        mci->pvt_info = window;
+
+        stacked = x38_is_stacked(pdev, drbs);
+
+        /*
+         * The dram rank boundary (DRB) reg values are boundary addresses
+         * for each DRAM rank with a granularity of 64MB.  DRB regs are
+         * cumulative; the last one will contain the total memory
+         * contained in all ranks.
+         */
+        last_page = -1UL;
+        for (i = 0; i < mci->nr_csrows; i++) {
+                unsigned long nr_pages;
+                struct csrow_info *csrow = &mci->csrows[i];
+
+                nr_pages = drb_to_nr_pages(drbs, stacked,
+                        i / X38_RANKS_PER_CHANNEL,
+                        i % X38_RANKS_PER_CHANNEL);
+
+                if (nr_pages == 0) {
+                        csrow->mtype = MEM_EMPTY;
+                        continue;
+                }
+
+                csrow->first_page = last_page + 1;
+                last_page += nr_pages;
+                csrow->last_page = last_page;
+                csrow->nr_pages = nr_pages;
+
+                csrow->grain = nr_pages << PAGE_SHIFT;
+                csrow->mtype = MEM_DDR2;
+                csrow->dtype = DEV_UNKNOWN;
+                csrow->edac_mode = EDAC_UNKNOWN;
+        }
+
+        x38_clear_error_info(mci);
+
+        rc = -ENODEV;
+        if (edac_mc_add_mc(mci)) {
+                debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__);
+                goto fail;
+        }
+
+        /* get this far and it's successful */
+        debugf3("MC: %s(): success\n", __func__);
+        return 0;
+
+fail:
+        iounmap(window);
+        if (mci)
+                edac_mc_free(mci);
+
+        return rc;
+}
+
+static int __devinit x38_init_one(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        int rc;
+
+        debugf0("MC: %s()\n", __func__);
+
+        if (pci_enable_device(pdev) < 0)
+                return -EIO;
+
+        rc = x38_probe1(pdev, ent->driver_data);
+        if (!mci_pdev)
+                mci_pdev = pci_dev_get(pdev);
+
+        return rc;
+}
+
+static void __devexit x38_remove_one(struct pci_dev *pdev)
+{
+        struct mem_ctl_info *mci;
+
+        debugf0("%s()\n", __func__);
+
+        mci = edac_mc_del_mc(&pdev->dev);
+        if (!mci)
+                return;
+
+        iounmap(mci->pvt_info);
+
+        edac_mc_free(mci);
+}
+
+static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
+        {
+         PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+         X38},
+        {
+         0,
+         }                      /* 0 terminated list. */
+};
+
+MODULE_DEVICE_TABLE(pci, x38_pci_tbl);
+
+static struct pci_driver x38_driver = {
+        .name = EDAC_MOD_STR,
+        .probe = x38_init_one,
+        .remove = __devexit_p(x38_remove_one),
+        .id_table = x38_pci_tbl,
+};
+
+static int __init x38_init(void)
+{
+        int pci_rc;
+
+        debugf3("MC: %s()\n", __func__);
+
+        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+        opstate_init();
+
+        pci_rc = pci_register_driver(&x38_driver);
+        if (pci_rc < 0)
+                goto fail0;
+
+        if (!mci_pdev) {
+                x38_registered = 0;
+                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                        PCI_DEVICE_ID_INTEL_X38_HB, NULL);
+                if (!mci_pdev) {
+                        debugf0("x38 pci_get_device fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+
+                pci_rc = x38_init_one(mci_pdev, x38_pci_tbl);
+                if (pci_rc < 0) {
+                        debugf0("x38 init fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+        }
+
+        return 0;
+
+fail1:
+        pci_unregister_driver(&x38_driver);
+
+fail0:
+        if (mci_pdev)
+                pci_dev_put(mci_pdev);
+
+        return pci_rc;
+}
+
+static void __exit x38_exit(void)
+{
+        debugf3("MC: %s()\n", __func__);
+
+        pci_unregister_driver(&x38_driver);
+        if (!x38_registered) {
+                x38_remove_one(mci_pdev);
+                pci_dev_put(mci_pdev);
+        }
+}
+
+module_init(x38_init);
+module_exit(x38_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Cluster Computing, Inc. Hitoshi Mitake");
+MODULE_DESCRIPTION("MC support for Intel X38 memory hub controllers");
+
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 3fccdd484100..6b9be42c7b98 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -587,8 +587,7 @@ static void create_units(struct fw_device *device)
                 unit->device.bus = &fw_bus_type;
                 unit->device.type = &fw_unit_type;
                 unit->device.parent = &device->device;
-                snprintf(unit->device.bus_id, sizeof(unit->device.bus_id),
-                         "%s.%d", device->device.bus_id, i++);
+                dev_set_name(&unit->device, "%s.%d", dev_name(&device->device), i++);
 
                 init_fw_attribute_group(&unit->device,
                                         fw_unit_attributes,
@@ -711,8 +710,7 @@ static void fw_device_init(struct work_struct *work)
         device->device.type = &fw_device_type;
         device->device.parent = device->card->device;
         device->device.devt = MKDEV(fw_cdev_major, minor);
-        snprintf(device->device.bus_id, sizeof(device->device.bus_id),
-                 "fw%d", minor);
+        dev_set_name(&device->device, "fw%d", minor);
 
         init_fw_attribute_group(&device->device,
                                 fw_device_attributes,
@@ -741,13 +739,13 @@ static void fw_device_init(struct work_struct *work)
                 if (device->config_rom_retries)
                         fw_notify("created device %s: GUID %08x%08x, S%d00, "
                                   "%d config ROM retries\n",
-                                  device->device.bus_id,
+                                  dev_name(&device->device),
                                   device->config_rom[3], device->config_rom[4],
                                   1 << device->max_speed,
                                   device->config_rom_retries);
                 else
                         fw_notify("created device %s: GUID %08x%08x, S%d00\n",
-                                  device->device.bus_id,
+                                  dev_name(&device->device),
                                   device->config_rom[3], device->config_rom[4],
                                   1 << device->max_speed);
                 device->config_rom_retries = 0;
@@ -883,12 +881,12 @@ static void fw_device_refresh(struct work_struct *work)
                     FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
                 goto gone;
 
-        fw_notify("refreshed device %s\n", device->device.bus_id);
+        fw_notify("refreshed device %s\n", dev_name(&device->device));
         device->config_rom_retries = 0;
         goto out;
 
  give_up:
-        fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
+        fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
  gone:
         atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
         fw_device_shutdown(work);
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 251416f2148f..46610b090415 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -476,6 +476,7 @@ static int ar_context_add_page(struct ar_context *ctx)
         if (ab == NULL)
                 return -ENOMEM;
 
+        ab->next = NULL;
         memset(&ab->descriptor, 0, sizeof(ab->descriptor));
         ab->descriptor.control        = cpu_to_le16(DESCRIPTOR_INPUT_MORE |
                                                     DESCRIPTOR_STATUS |
@@ -496,6 +497,21 @@ static int ar_context_add_page(struct ar_context *ctx)
         return 0;
 }
 
+static void ar_context_release(struct ar_context *ctx)
+{
+        struct ar_buffer *ab, *ab_next;
+        size_t offset;
+        dma_addr_t ab_bus;
+
+        for (ab = ctx->current_buffer; ab; ab = ab_next) {
+                ab_next = ab->next;
+                offset = offsetof(struct ar_buffer, data);
+                ab_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
+                dma_free_coherent(ctx->ohci->card.device, PAGE_SIZE,
+                                  ab, ab_bus);
+        }
+}
+
 #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
 #define cond_le32_to_cpu(v) \
         (ohci->old_uninorth ? (__force __u32)(v) : le32_to_cpu(v))
@@ -2349,8 +2365,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 
         ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
         if (ohci == NULL) {
-                fw_error("Could not malloc fw_ohci data.\n");
-                return -ENOMEM;
+                err = -ENOMEM;
+                goto fail;
         }
 
         fw_card_initialize(&ohci->card, &ohci_driver, &dev->dev);
@@ -2359,7 +2375,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 
         err = pci_enable_device(dev);
         if (err) {
-                fw_error("Failed to enable OHCI hardware.\n");
+                fw_error("Failed to enable OHCI hardware\n");
                 goto fail_free;
         }
 
@@ -2427,9 +2443,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         ohci->ir_context_list = kzalloc(size, GFP_KERNEL);
 
         if (ohci->it_context_list == NULL || ohci->ir_context_list == NULL) {
-                fw_error("Out of memory for it/ir contexts.\n");
                 err = -ENOMEM;
-                goto fail_registers;
+                goto fail_contexts;
         }
 
         /* self-id dma buffer allocation */
@@ -2438,9 +2453,8 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                                                &ohci->self_id_bus,
                                                GFP_KERNEL);
         if (ohci->self_id_cpu == NULL) {
-                fw_error("Out of memory for self ID buffer.\n");
                 err = -ENOMEM;
-                goto fail_registers;
+                goto fail_contexts;
         }
 
         bus_options = reg_read(ohci, OHCI1394_BusOptions);
@@ -2454,15 +2468,19 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                 goto fail_self_id;
 
         fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
-                  dev->dev.bus_id, version >> 16, version & 0xff);
+                  dev_name(&dev->dev), version >> 16, version & 0xff);
         return 0;
 
  fail_self_id:
         dma_free_coherent(ohci->card.device, SELF_ID_BUF_SIZE,
                           ohci->self_id_cpu, ohci->self_id_bus);
- fail_registers:
-        kfree(ohci->it_context_list);
+ fail_contexts:
         kfree(ohci->ir_context_list);
+        kfree(ohci->it_context_list);
+        context_release(&ohci->at_response_ctx);
+        context_release(&ohci->at_request_ctx);
+        ar_context_release(&ohci->ar_response_ctx);
+        ar_context_release(&ohci->ar_request_ctx);
         pci_iounmap(dev, ohci->registers);
  fail_iomem:
         pci_release_region(dev, 0);
@@ -2471,6 +2489,9 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
  fail_free:
         kfree(&ohci->card);
         ohci_pmac_off(dev);
+ fail:
+        if (err == -ENOMEM)
+                fw_error("Out of memory\n");
 
         return err;
 }
@@ -2491,8 +2512,19 @@ static void pci_remove(struct pci_dev *dev)
 
         software_reset(ohci);
         free_irq(dev->irq, ohci);
+
+        if (ohci->next_config_rom && ohci->next_config_rom != ohci->config_rom)
+                dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                  ohci->next_config_rom, ohci->next_config_rom_bus);
+        if (ohci->config_rom)
+                dma_free_coherent(ohci->card.device, CONFIG_ROM_SIZE,
+                                  ohci->config_rom, ohci->config_rom_bus);
         dma_free_coherent(ohci->card.device, SELF_ID_BUF_SIZE,
                           ohci->self_id_cpu, ohci->self_id_bus);
+        ar_context_release(&ohci->ar_request_ctx);
+        ar_context_release(&ohci->ar_response_ctx);
+        context_release(&ohci->at_request_ctx);
+        context_release(&ohci->at_response_ctx);
         kfree(ohci->it_context_list);
         kfree(ohci->ir_context_list);
         pci_iounmap(dev, ohci->registers);
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index ef0b9b419c27..97df6dac3a82 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -173,6 +173,9 @@ struct sbp2_target {
         int blocked;    /* ditto */
 };
 
+/* Impossible login_id, to detect logout attempt before successful login */
+#define INVALID_LOGIN_ID 0x10000
+
 /*
  * Per section 7.4.8 of the SBP-2 spec, a mgt_ORB_timeout value can be
  * provided in the config rom. Most devices do provide a value, which
@@ -788,9 +791,20 @@ static void sbp2_release_target(struct kref *kref)
                         scsi_remove_device(sdev);
                         scsi_device_put(sdev);
                 }
-                sbp2_send_management_orb(lu, tgt->node_id, lu->generation,
-                                SBP2_LOGOUT_REQUEST, lu->login_id, NULL);
-
+                if (lu->login_id != INVALID_LOGIN_ID) {
+                        int generation, node_id;
+                        /*
+                         * tgt->node_id may be obsolete here if we failed
+                         * during initial login or after a bus reset where
+                         * the topology changed.
+                         */
+                        generation = device->generation;
+                        smp_rmb(); /* node_id vs. generation */
+                        node_id    = device->node_id;
+                        sbp2_send_management_orb(lu, node_id, generation,
+                                                 SBP2_LOGOUT_REQUEST,
+                                                 lu->login_id, NULL);
+                }
                 fw_core_remove_address_handler(&lu->address_handler);
                 list_del(&lu->link);
                 kfree(lu);
@@ -805,19 +819,20 @@ static void sbp2_release_target(struct kref *kref)
 
 static struct workqueue_struct *sbp2_wq;
 
+static void sbp2_target_put(struct sbp2_target *tgt)
+{
+        kref_put(&tgt->kref, sbp2_release_target);
+}
+
 /*
  * Always get the target's kref when scheduling work on one its units.
  * Each workqueue job is responsible to call sbp2_target_put() upon return.
  */
 static void sbp2_queue_work(struct sbp2_logical_unit *lu, unsigned long delay)
 {
-        if (queue_delayed_work(sbp2_wq, &lu->work, delay))
-                kref_get(&lu->tgt->kref);
-}
-
-static void sbp2_target_put(struct sbp2_target *tgt)
-{
-        kref_put(&tgt->kref, sbp2_release_target);
+        kref_get(&lu->tgt->kref);
+        if (!queue_delayed_work(sbp2_wq, &lu->work, delay))
+                sbp2_target_put(lu->tgt);
 }
 
 /*
@@ -978,6 +993,7 @@ static int sbp2_add_logical_unit(struct sbp2_target *tgt, int lun_entry)
 
         lu->tgt      = tgt;
         lu->lun      = lun_entry & 0xffff;
+        lu->login_id = INVALID_LOGIN_ID;
         lu->retries  = 0;
         lu->has_sdev = false;
         lu->blocked  = false;
@@ -1119,7 +1135,7 @@ static int sbp2_probe(struct device *dev)
         tgt->unit = unit;
         kref_init(&tgt->kref);
         INIT_LIST_HEAD(&tgt->lu_list);
-        tgt->bus_id = unit->device.bus_id;
+        tgt->bus_id = dev_name(&unit->device);
         tgt->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
 
         if (fw_device_enable_phys_dma(device) < 0)
@@ -1147,7 +1163,7 @@ static int sbp2_probe(struct device *dev)
 
         /* Do the login in a workqueue so we can easily reschedule retries. */
         list_for_each_entry(lu, &tgt->lu_list, link)
-                sbp2_queue_work(lu, 0);
+                sbp2_queue_work(lu, DIV_ROUND_UP(HZ, 5));
         return 0;
 
  fail_tgt_put:
diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c
index c1b81077c4a8..5e204713002d 100644
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
@@ -413,7 +413,7 @@ static void
 update_tree(struct fw_card *card, struct fw_node *root)
 {
         struct list_head list0, list1;
-        struct fw_node *node0, *node1;
+        struct fw_node *node0, *node1, *next1;
         int i, event;
 
         INIT_LIST_HEAD(&list0);
@@ -485,7 +485,9 @@ update_tree(struct fw_card *card, struct fw_node *root)
                 }
 
                 node0 = fw_node(node0->link.next);
-                node1 = fw_node(node1->link.next);
+                next1 = fw_node(node1->link.next);
+                fw_node_put(node1);
+                node1 = next1;
         }
 }
 
diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index 027f58ce81ad..aed7dbb17cda 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -248,7 +248,7 @@ struct fw_card {
         struct fw_node *local_node;
         struct fw_node *root_node;
         struct fw_node *irm_node;
-        int color;
+        u8 color; /* must be u8 to match the definition in struct fw_node */
         int gap_count;
         bool beta_repeaters_present;
 
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 3e526b6d00cb..8daf4793ac32 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -81,9 +81,9 @@ static void dmi_table(u8 *buf, int len, int num,
                 const struct dmi_header *dm = (const struct dmi_header *)data;
 
                 /*
-                 *  We want to know the total length (formated area and strings)
-                 *  before decoding to make sure we won't run off the table in
-                 *  dmi_decode or dmi_string
+                 *  We want to know the total length (formatted area and
+                 *  strings) before decoding to make sure we won't run off the
+                 *  table in dmi_decode or dmi_string
                  */
                 data += dm->length;
                 while ((data - buf < len - 1) && (data[0] || data[1]))
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 96f416afc3f6..3ab1e9cc4692 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -266,11 +266,19 @@ int drm_init(struct drm_driver *driver)
         for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
                 pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];
 
+                /* Loop around setting up a DRM device for each PCI device
+                 * matching our ID and device class.  If we had the internal
+                 * function that pci_get_subsys and pci_get_class used, we'd
+                 * be able to just pass pid in instead of doing a two-stage
+                 * thing.
+                 */
                 pdev = NULL;
-                /* pass back in pdev to account for multiple identical cards */
                 while ((pdev =
                         pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
                                        pid->subdevice, pdev)) != NULL) {
+                        if ((pdev->class & pid->class_mask) != pid->class)
+                                continue;
+
                         /* stealth mode requires a manual probe */
                         pci_dev_get(pdev);
                         drm_get_dev(pdev, pid, driver);
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 0d46627663b1..78eeed5caaff 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -406,8 +406,6 @@ int drm_release(struct inode *inode, struct file *filp)
         if (dev->driver->driver_features & DRIVER_GEM)
                 drm_gem_release(dev, file_priv);
 
-        drm_fasync(-1, filp, 0);
-
         mutex_lock(&dev->ctxlist_mutex);
         if (!list_empty(&dev->ctxlist)) {
                 struct drm_ctx_list *pos, *n;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 212a94f715b2..15c8dabc3e97 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -280,8 +280,6 @@ int drm_irq_uninstall(struct drm_device * dev)
 
         drm_vblank_cleanup(dev);
 
-        dev->locked_tasklet_func = NULL;
-
         return 0;
 }
 EXPORT_SYMBOL(drm_irq_uninstall);
@@ -699,81 +697,3 @@ void drm_handle_vblank(struct drm_device *dev, int crtc)
         drm_vbl_send_signals(dev, crtc);
 }
 EXPORT_SYMBOL(drm_handle_vblank);
-
-/**
- * Tasklet wrapper function.
- *
- * \param data DRM device in disguise.
- *
- * Attempts to grab the HW lock and calls the driver callback on success. On
- * failure, leave the lock marked as contended so the callback can be called
- * from drm_unlock().
- */
-static void drm_locked_tasklet_func(unsigned long data)
-{
-        struct drm_device *dev = (struct drm_device *)data;
-        unsigned long irqflags;
-        void (*tasklet_func)(struct drm_device *);
-        
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-        tasklet_func = dev->locked_tasklet_func;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-
-        if (!tasklet_func ||
-            !drm_lock_take(&dev->lock,
-                           DRM_KERNEL_CONTEXT)) {
-                return;
-        }
-
-        dev->lock.lock_time = jiffies;
-        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
-
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-        tasklet_func = dev->locked_tasklet_func;
-        dev->locked_tasklet_func = NULL;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-        
-        if (tasklet_func != NULL)
-                tasklet_func(dev);
-
-        drm_lock_free(&dev->lock,
-                      DRM_KERNEL_CONTEXT);
-}
-
-/**
- * Schedule a tasklet to call back a driver hook with the HW lock held.
- *
- * \param dev DRM device.
- * \param func Driver callback.
- *
- * This is intended for triggering actions that require the HW lock from an
- * interrupt handler. The lock will be grabbed ASAP after the interrupt handler
- * completes. Note that the callback may be called from interrupt or process
- * context, it must not make any assumptions about this. Also, the HW lock will
- * be held with the kernel context or any client context.
- */
-void drm_locked_tasklet(struct drm_device *dev, void (*func)(struct drm_device *))
-{
-        unsigned long irqflags;
-        static DECLARE_TASKLET(drm_tasklet, drm_locked_tasklet_func, 0);
-
-        if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ) ||
-            test_bit(TASKLET_STATE_SCHED, &drm_tasklet.state))
-                return;
-
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-
-        if (dev->locked_tasklet_func) {
-                spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-                return;
-        }
-
-        dev->locked_tasklet_func = func;
-
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-
-        drm_tasklet.data = (unsigned long)dev;
-
-        tasklet_hi_schedule(&drm_tasklet);
-}
-EXPORT_SYMBOL(drm_locked_tasklet);
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 888159e03d26..1cfa72031f8f 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -154,8 +154,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         struct drm_lock *lock = data;
-        unsigned long irqflags;
-        void (*tasklet_func)(struct drm_device *);
 
         if (lock->context == DRM_KERNEL_CONTEXT) {
                 DRM_ERROR("Process %d using kernel context %d\n",
@@ -163,13 +161,6 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                 return -EINVAL;
         }
 
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-        tasklet_func = dev->locked_tasklet_func;
-        dev->locked_tasklet_func = NULL;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-        if (tasklet_func != NULL)
-                tasklet_func(dev);
-
         atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
 
         /* kernel_context_switch isn't used by any of the x86 drm
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 141e33004a76..66c96ec66672 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -92,7 +92,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
 
         spin_lock_init(&dev->count_lock);
         spin_lock_init(&dev->drw_lock);
-        spin_lock_init(&dev->tasklet_lock);
         spin_lock_init(&dev->lock.spinlock);
         init_timer(&dev->timer);
         mutex_init(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 5ba78e4fd2b5..d8fb5d8ee7ea 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -3,13 +3,14 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 ccflags-y := -Iinclude/drm
-i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_opregion.o \
+i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
           i915_suspend.o \
           i915_gem.o \
           i915_gem_debug.o \
           i915_gem_proc.o \
           i915_gem_tiling.o
 
+i915-$(CONFIG_ACPI)     += i915_opregion.o
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
 obj-$(CONFIG_DRM_I915)  += i915.o
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 01de536e0211..0d215e38606a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -154,6 +154,9 @@ static int i915_dma_cleanup(struct drm_device * dev)
         if (I915_NEED_GFX_HWS(dev))
                 i915_free_hws(dev);
 
+        dev_priv->sarea = NULL;
+        dev_priv->sarea_priv = NULL;
+
         return 0;
 }
 
@@ -442,7 +445,7 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
 
         BEGIN_LP_RING(4);
         OUT_RING(MI_STORE_DWORD_INDEX);
-        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
+        OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
         OUT_RING(0);
         ADVANCE_LP_RING();
@@ -573,7 +576,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
 
         BEGIN_LP_RING(4);
         OUT_RING(MI_STORE_DWORD_INDEX);
-        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
+        OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
         OUT_RING(0);
         ADVANCE_LP_RING();
@@ -608,7 +611,6 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                             struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
         drm_i915_batchbuffer_t *batch = data;
@@ -634,7 +636,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
         mutex_unlock(&dev->struct_mutex);
 
         if (sarea_priv)
-                sarea_priv->last_dispatch = (int)hw_status[5];
+                sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
         return ret;
 }
 
@@ -642,7 +644,6 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                           struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
         drm_i915_cmdbuffer_t *cmdbuf = data;
@@ -670,7 +671,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
         }
 
         if (sarea_priv)
-                sarea_priv->last_dispatch = (int)hw_status[5];
+                sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
         return 0;
 }
 
@@ -849,8 +850,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
          * be lost or delayed
          */
         if (!IS_I945G(dev) && !IS_I945GM(dev) && !IS_I965GM(dev))
-                if (pci_enable_msi(dev->pdev))
-                        DRM_ERROR("failed to enable MSI\n");
+                pci_enable_msi(dev->pdev);
 
         intel_opregion_init(dev);
 
@@ -960,6 +960,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
         DRM_IOCTL_DEF(DRM_I915_GEM_SW_FINISH, i915_gem_sw_finish_ioctl, 0),
         DRM_IOCTL_DEF(DRM_I915_GEM_SET_TILING, i915_gem_set_tiling, 0),
         DRM_IOCTL_DEF(DRM_I915_GEM_GET_TILING, i915_gem_get_tiling, 0),
+        DRM_IOCTL_DEF(DRM_I915_GEM_GET_APERTURE, i915_gem_get_aperture_ioctl, 0),
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f20ffe17df71..ef1c0b8f8d07 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -31,6 +31,7 @@
 #define _I915_DRV_H_
 
 #include "i915_reg.h"
+#include <linux/io-mapping.h>
 
 /* General customization:
  */
@@ -87,13 +88,6 @@ struct mem_block {
         struct drm_file *file_priv; /* NULL: free, -1: heap, other: real files */
 };
 
-typedef struct _drm_i915_vbl_swap {
-        struct list_head head;
-        drm_drawable_t drw_id;
-        unsigned int pipe;
-        unsigned int sequence;
-} drm_i915_vbl_swap_t;
-
 struct opregion_header;
 struct opregion_acpi;
 struct opregion_swsci;
@@ -145,10 +139,6 @@ typedef struct drm_i915_private {
         unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
         int vblank_pipe;
 
-        spinlock_t swaps_lock;
-        drm_i915_vbl_swap_t vbl_swaps;
-        unsigned int swaps_pending;
-
         struct intel_opregion opregion;
 
         /* Register state */
@@ -156,6 +146,7 @@ typedef struct drm_i915_private {
         u32 saveDSPACNTR;
         u32 saveDSPBCNTR;
         u32 saveDSPARB;
+        u32 saveRENDERSTANDBY;
         u32 savePIPEACONF;
         u32 savePIPEBCONF;
         u32 savePIPEASRC;
@@ -240,12 +231,11 @@ typedef struct drm_i915_private {
         u8 saveDACDATA[256*3]; /* 256 3-byte colors */
         u8 saveCR[37];
 
-        /** Work task for vblank-related ring access */
-        struct work_struct vblank_work;
-
         struct {
                 struct drm_mm gtt_space;
 
+                struct io_mapping *gtt_mapping;
+
                 /**
                  * List of objects currently involved in rendering from the
                  * ringbuffer.
@@ -441,7 +431,6 @@ extern int i915_irq_wait(struct drm_device *dev, void *data,
 void i915_user_irq_get(struct drm_device *dev);
 void i915_user_irq_put(struct drm_device *dev);
 
-extern void i915_vblank_work_handler(struct work_struct *work);
 extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
 extern void i915_driver_irq_preinstall(struct drm_device * dev);
 extern int i915_driver_irq_postinstall(struct drm_device *dev);
@@ -502,6 +491,8 @@ int i915_gem_set_tiling(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
 int i915_gem_get_tiling(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
+int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
+                                struct drm_file *file_priv);
 void i915_gem_load(struct drm_device *dev);
 int i915_gem_proc_init(struct drm_minor *minor);
 void i915_gem_proc_cleanup(struct drm_minor *minor);
@@ -539,11 +530,18 @@ extern int i915_restore_state(struct drm_device *dev);
 extern int i915_save_state(struct drm_device *dev);
 extern int i915_restore_state(struct drm_device *dev);
 
+#ifdef CONFIG_ACPI
 /* i915_opregion.c */
 extern int intel_opregion_init(struct drm_device *dev);
 extern void intel_opregion_free(struct drm_device *dev);
 extern void opregion_asle_intr(struct drm_device *dev);
 extern void opregion_enable_asle(struct drm_device *dev);
+#else
+static inline int intel_opregion_init(struct drm_device *dev) { return 0; }
+static inline void intel_opregion_free(struct drm_device *dev) { return; }
+static inline void opregion_asle_intr(struct drm_device *dev) { return; }
+static inline void opregion_enable_asle(struct drm_device *dev) { return; }
+#endif
 
 /**
  * Lock test for when it's just for synchronization of ring access.
@@ -610,8 +608,9 @@ extern void opregion_enable_asle(struct drm_device *dev);
  * The area from dword 0x20 to 0x3ff is available for driver usage.
  */
 #define READ_HWSP(dev_priv, reg)  (((volatile u32*)(dev_priv->hw_status_page))[reg])
-#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, 5)
+#define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, I915_BREADCRUMB_INDEX)
 #define I915_GEM_HWS_INDEX              0x20
+#define I915_BREADCRUMB_INDEX           0x21
 
 extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 17ae330ff269..6b4a2bd20640 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -79,6 +79,28 @@ i915_gem_init_ioctl(struct drm_device *dev, void *data,
         return 0;
 }
 
+int
+i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
+                            struct drm_file *file_priv)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        struct drm_i915_gem_get_aperture *args = data;
+        struct drm_i915_gem_object *obj_priv;
+
+        if (!(dev->driver->driver_features & DRIVER_GEM))
+                return -ENODEV;
+
+        args->aper_size = dev->gtt_total;
+        args->aper_available_size = args->aper_size;
+
+        list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) {
+                if (obj_priv->pin_count > 0)
+                        args->aper_available_size -= obj_priv->obj->size;
+        }
+
+        return 0;
+}
+
 
 /**
  * Creates a new mm object and returns a handle to it.
@@ -171,35 +193,50 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
         return 0;
 }
 
-/*
- * Try to write quickly with an atomic kmap. Return true on success.
- *
- * If this fails (which includes a partial write), we'll redo the whole
- * thing with the slow version.
- *
- * This is a workaround for the low performance of iounmap (approximate
- * 10% cpu cost on normal 3D workloads).  kmap_atomic on HIGHMEM kernels
- * happens to let us map card memory without taking IPIs.  When the vmap
- * rework lands we should be able to dump this hack.
+/* This is the fast write path which cannot handle
+ * page faults in the source data
  */
-static inline int fast_user_write(unsigned long pfn, char __user *user_data,
-                                  int l, int o)
+
+static inline int
+fast_user_write(struct io_mapping *mapping,
+                loff_t page_base, int page_offset,
+                char __user *user_data,
+                int length)
 {
-#ifdef CONFIG_HIGHMEM
-        unsigned long unwritten;
         char *vaddr_atomic;
+        unsigned long unwritten;
 
-        vaddr_atomic = kmap_atomic_pfn(pfn, KM_USER0);
-#if WATCH_PWRITE
-        DRM_INFO("pwrite i %d o %d l %d pfn %ld vaddr %p\n",
-                 i, o, l, pfn, vaddr_atomic);
-#endif
-        unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + o, user_data, l);
-        kunmap_atomic(vaddr_atomic, KM_USER0);
-        return !unwritten;
-#else
+        vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
+        unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset,
+                                                      user_data, length);
+        io_mapping_unmap_atomic(vaddr_atomic);
+        if (unwritten)
+                return -EFAULT;
+        return 0;
+}
+
+/* Here's the write path which can sleep for
+ * page faults
+ */
+
+static inline int
+slow_user_write(struct io_mapping *mapping,
+                loff_t page_base, int page_offset,
+                char __user *user_data,
+                int length)
+{
+        char __iomem *vaddr;
+        unsigned long unwritten;
+
+        vaddr = io_mapping_map_wc(mapping, page_base);
+        if (vaddr == NULL)
+                return -EFAULT;
+        unwritten = __copy_from_user(vaddr + page_offset,
+                                     user_data, length);
+        io_mapping_unmap(vaddr);
+        if (unwritten)
+                return -EFAULT;
         return 0;
-#endif
 }
 
 static int
@@ -208,10 +245,12 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
                     struct drm_file *file_priv)
 {
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
+        drm_i915_private_t *dev_priv = dev->dev_private;
         ssize_t remain;
-        loff_t offset;
+        loff_t offset, page_base;
         char __user *user_data;
-        int ret = 0;
+        int page_offset, page_length;
+        int ret;
 
         user_data = (char __user *) (uintptr_t) args->data_ptr;
         remain = args->size;
@@ -235,57 +274,37 @@ i915_gem_gtt_pwrite(struct drm_device *dev, struct drm_gem_object *obj,
         obj_priv->dirty = 1;
 
         while (remain > 0) {
-                unsigned long pfn;
-                int i, o, l;
-
                 /* Operation in this page
                  *
-                 * i = page number
-                 * o = offset within page
-                 * l = bytes to copy
+                 * page_base = page offset within aperture
+                 * page_offset = offset within page
+                 * page_length = bytes to copy for this page
                  */
-                i = offset >> PAGE_SHIFT;
-                o = offset & (PAGE_SIZE-1);
-                l = remain;
-                if ((o + l) > PAGE_SIZE)
-                        l = PAGE_SIZE - o;
-
-                pfn = (dev->agp->base >> PAGE_SHIFT) + i;
-
-                if (!fast_user_write(pfn, user_data, l, o)) {
-                        unsigned long unwritten;
-                        char __iomem *vaddr;
-
-                        vaddr = ioremap_wc(pfn << PAGE_SHIFT, PAGE_SIZE);
-#if WATCH_PWRITE
-                        DRM_INFO("pwrite slow i %d o %d l %d "
-                                 "pfn %ld vaddr %p\n",
-                                 i, o, l, pfn, vaddr);
-#endif
-                        if (vaddr == NULL) {
-                                ret = -EFAULT;
-                                goto fail;
-                        }
-                        unwritten = __copy_from_user(vaddr + o, user_data, l);
-#if WATCH_PWRITE
-                        DRM_INFO("unwritten %ld\n", unwritten);
-#endif
-                        iounmap(vaddr);
-                        if (unwritten) {
-                                ret = -EFAULT;
+                page_base = (offset & ~(PAGE_SIZE-1));
+                page_offset = offset & (PAGE_SIZE-1);
+                page_length = remain;
+                if ((page_offset + remain) > PAGE_SIZE)
+                        page_length = PAGE_SIZE - page_offset;
+
+                ret = fast_user_write (dev_priv->mm.gtt_mapping, page_base,
+                                       page_offset, user_data, page_length);
+
+                /* If we get a fault while copying data, then (presumably) our
+                 * source page isn't available. In this case, use the
+                 * non-atomic function
+                 */
+                if (ret) {
+                        ret = slow_user_write (dev_priv->mm.gtt_mapping,
+                                               page_base, page_offset,
+                                               user_data, page_length);
+                        if (ret)
                                 goto fail;
-                        }
                 }
 
-                remain -= l;
-                user_data += l;
-                offset += l;
+                remain -= page_length;
+                user_data += page_length;
+                offset += page_length;
         }
-#if WATCH_PWRITE && 1
-        i915_gem_clflush_object(obj);
-        i915_gem_dump_object(obj, args->offset + args->size, __func__, ~0);
-        i915_gem_clflush_object(obj);
-#endif
 
 fail:
         i915_gem_object_unpin(obj);
@@ -1436,11 +1455,9 @@ i915_gem_object_set_domain_range(struct drm_gem_object *obj,
                                                   read_domains, write_domain);
 
         /* Wait on any GPU rendering to the object to be flushed. */
-        if (obj->write_domain & ~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) {
-                ret = i915_gem_object_wait_rendering(obj);
-                if (ret)
-                        return ret;
-        }
+        ret = i915_gem_object_wait_rendering(obj);
+        if (ret)
+                return ret;
 
         if (obj_priv->page_cpu_valid == NULL) {
                 obj_priv->page_cpu_valid = drm_calloc(1, obj->size / PAGE_SIZE,
@@ -1503,12 +1520,12 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                                  struct drm_i915_gem_exec_object *entry)
 {
         struct drm_device *dev = obj->dev;
+        drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_gem_relocation_entry reloc;
         struct drm_i915_gem_relocation_entry __user *relocs;
         struct drm_i915_gem_object *obj_priv = obj->driver_private;
         int i, ret;
-        uint32_t last_reloc_offset = -1;
-        void __iomem *reloc_page = NULL;
+        void __iomem *reloc_page;
 
         /* Choose the GTT offset for our buffer and put it there. */
         ret = i915_gem_object_pin(obj, (uint32_t) entry->alignment);
@@ -1631,26 +1648,11 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                  * perform.
                  */
                 reloc_offset = obj_priv->gtt_offset + reloc.offset;
-                if (reloc_page == NULL ||
-                    (last_reloc_offset & ~(PAGE_SIZE - 1)) !=
-                    (reloc_offset & ~(PAGE_SIZE - 1))) {
-                        if (reloc_page != NULL)
-                                iounmap(reloc_page);
-
-                        reloc_page = ioremap_wc(dev->agp->base +
-                                                (reloc_offset &
-                                                 ~(PAGE_SIZE - 1)),
-                                                PAGE_SIZE);
-                        last_reloc_offset = reloc_offset;
-                        if (reloc_page == NULL) {
-                                drm_gem_object_unreference(target_obj);
-                                i915_gem_object_unpin(obj);
-                                return -ENOMEM;
-                        }
-                }
-
+                reloc_page = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping,
+                                                      (reloc_offset &
+                                                       ~(PAGE_SIZE - 1)));
                 reloc_entry = (uint32_t __iomem *)(reloc_page +
-                                           (reloc_offset & (PAGE_SIZE - 1)));
+                                                   (reloc_offset & (PAGE_SIZE - 1)));
                 reloc_val = target_obj_priv->gtt_offset + reloc.delta;
 
 #if WATCH_BUF
@@ -1659,6 +1661,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                           readl(reloc_entry), reloc_val);
 #endif
                 writel(reloc_val, reloc_entry);
+                io_mapping_unmap_atomic(reloc_page);
 
                 /* Write the updated presumed offset for this entry back out
                  * to the user.
@@ -1674,9 +1677,6 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
                 drm_gem_object_unreference(target_obj);
         }
 
-        if (reloc_page != NULL)
-                iounmap(reloc_page);
-
 #if WATCH_BUF
         if (0)
                 i915_gem_dump_object(obj, 128, __func__, ~0);
@@ -2518,6 +2518,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
         if (ret != 0)
                 return ret;
 
+        dev_priv->mm.gtt_mapping = io_mapping_create_wc(dev->agp->base,
+                                                        dev->agp->agp_info.aper_size
+                                                        * 1024 * 1024);
+
         mutex_lock(&dev->struct_mutex);
         BUG_ON(!list_empty(&dev_priv->mm.active_list));
         BUG_ON(!list_empty(&dev_priv->mm.flushing_list));
@@ -2535,11 +2539,13 @@ int
 i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
                        struct drm_file *file_priv)
 {
+        drm_i915_private_t *dev_priv = dev->dev_private;
         int ret;
 
         ret = i915_gem_idle(dev);
         drm_irq_uninstall(dev);
 
+        io_mapping_free(dev_priv->mm.gtt_mapping);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 26f48932a51e..82752d6177a4 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -80,211 +80,6 @@ i915_pipe_enabled(struct drm_device *dev, int pipe)
         return 0;
 }
 
-/**
- * Emit blits for scheduled buffer swaps.
- *
- * This function will be called with the HW lock held.
- * Because this function must grab the ring mutex (dev->struct_mutex),
- * it can no longer run at soft irq time. We'll fix this when we do
- * the DRI2 swap buffer work.
- */
-static void i915_vblank_tasklet(struct drm_device *dev)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        unsigned long irqflags;
-        struct list_head *list, *tmp, hits, *hit;
-        int nhits, nrects, slice[2], upper[2], lower[2], i;
-        unsigned counter[2];
-        struct drm_drawable_info *drw;
-        drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
-        u32 cpp = dev_priv->cpp;
-        u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
-                                XY_SRC_COPY_BLT_WRITE_ALPHA |
-                                XY_SRC_COPY_BLT_WRITE_RGB)
-                             : XY_SRC_COPY_BLT_CMD;
-        u32 src_pitch = sarea_priv->pitch * cpp;
-        u32 dst_pitch = sarea_priv->pitch * cpp;
-        u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
-        RING_LOCALS;
-
-        mutex_lock(&dev->struct_mutex);
-
-        if (IS_I965G(dev) && sarea_priv->front_tiled) {
-                cmd |= XY_SRC_COPY_BLT_DST_TILED;
-                dst_pitch >>= 2;
-        }
-        if (IS_I965G(dev) && sarea_priv->back_tiled) {
-                cmd |= XY_SRC_COPY_BLT_SRC_TILED;
-                src_pitch >>= 2;
-        }
-
-        counter[0] = drm_vblank_count(dev, 0);
-        counter[1] = drm_vblank_count(dev, 1);
-
-        DRM_DEBUG("\n");
-
-        INIT_LIST_HEAD(&hits);
-
-        nhits = nrects = 0;
-
-        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
-
-        /* Find buffer swaps scheduled for this vertical blank */
-        list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
-                drm_i915_vbl_swap_t *vbl_swap =
-                        list_entry(list, drm_i915_vbl_swap_t, head);
-                int pipe = vbl_swap->pipe;
-
-                if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
-                        continue;
-
-                list_del(list);
-                dev_priv->swaps_pending--;
-                drm_vblank_put(dev, pipe);
-
-                spin_unlock(&dev_priv->swaps_lock);
-                spin_lock(&dev->drw_lock);
-
-                drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-
-                list_for_each(hit, &hits) {
-                        drm_i915_vbl_swap_t *swap_cmp =
-                                list_entry(hit, drm_i915_vbl_swap_t, head);
-                        struct drm_drawable_info *drw_cmp =
-                                drm_get_drawable_info(dev, swap_cmp->drw_id);
-
-                        /* Make sure both drawables are still
-                         * around and have some rectangles before
-                         * we look inside to order them for the
-                         * blts below.
-                         */
-                        if (drw_cmp && drw_cmp->num_rects > 0 &&
-                            drw && drw->num_rects > 0 &&
-                            drw_cmp->rects[0].y1 > drw->rects[0].y1) {
-                                list_add_tail(list, hit);
-                                break;
-                        }
-                }
-
-                spin_unlock(&dev->drw_lock);
-
-                /* List of hits was empty, or we reached the end of it */
-                if (hit == &hits)
-                        list_add_tail(list, hits.prev);
-
-                nhits++;
-
-                spin_lock(&dev_priv->swaps_lock);
-        }
-
-        if (nhits == 0) {
-                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-                mutex_unlock(&dev->struct_mutex);
-                return;
-        }
-
-        spin_unlock(&dev_priv->swaps_lock);
-
-        i915_kernel_lost_context(dev);
-
-        if (IS_I965G(dev)) {
-                BEGIN_LP_RING(4);
-
-                OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
-                OUT_RING(0);
-                OUT_RING(((sarea_priv->width - 1) & 0xffff) | ((sarea_priv->height - 1) << 16));
-                OUT_RING(0);
-                ADVANCE_LP_RING();
-        } else {
-                BEGIN_LP_RING(6);
-
-                OUT_RING(GFX_OP_DRAWRECT_INFO);
-                OUT_RING(0);
-                OUT_RING(0);
-                OUT_RING(sarea_priv->width | sarea_priv->height << 16);
-                OUT_RING(sarea_priv->width | sarea_priv->height << 16);
-                OUT_RING(0);
-
-                ADVANCE_LP_RING();
-        }
-
-        sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
-
-        upper[0] = upper[1] = 0;
-        slice[0] = max(sarea_priv->pipeA_h / nhits, 1);
-        slice[1] = max(sarea_priv->pipeB_h / nhits, 1);
-        lower[0] = sarea_priv->pipeA_y + slice[0];
-        lower[1] = sarea_priv->pipeB_y + slice[0];
-
-        spin_lock(&dev->drw_lock);
-
-        /* Emit blits for buffer swaps, partitioning both outputs into as many
-         * slices as there are buffer swaps scheduled in order to avoid tearing
-         * (based on the assumption that a single buffer swap would always
-         * complete before scanout starts).
-         */
-        for (i = 0; i++ < nhits;
-             upper[0] = lower[0], lower[0] += slice[0],
-             upper[1] = lower[1], lower[1] += slice[1]) {
-                if (i == nhits)
-                        lower[0] = lower[1] = sarea_priv->height;
-
-                list_for_each(hit, &hits) {
-                        drm_i915_vbl_swap_t *swap_hit =
-                                list_entry(hit, drm_i915_vbl_swap_t, head);
-                        struct drm_clip_rect *rect;
-                        int num_rects, pipe;
-                        unsigned short top, bottom;
-
-                        drw = drm_get_drawable_info(dev, swap_hit->drw_id);
-
-                        /* The drawable may have been destroyed since
-                         * the vblank swap was queued
-                         */
-                        if (!drw)
-                                continue;
-
-                        rect = drw->rects;
-                        pipe = swap_hit->pipe;
-                        top = upper[pipe];
-                        bottom = lower[pipe];
-
-                        for (num_rects = drw->num_rects; num_rects--; rect++) {
-                                int y1 = max(rect->y1, top);
-                                int y2 = min(rect->y2, bottom);
-
-                                if (y1 >= y2)
-                                        continue;
-
-                                BEGIN_LP_RING(8);
-
-                                OUT_RING(cmd);
-                                OUT_RING(ropcpp | dst_pitch);
-                                OUT_RING((y1 << 16) | rect->x1);
-                                OUT_RING((y2 << 16) | rect->x2);
-                                OUT_RING(sarea_priv->front_offset);
-                                OUT_RING((y1 << 16) | rect->x1);
-                                OUT_RING(src_pitch);
-                                OUT_RING(sarea_priv->back_offset);
-
-                                ADVANCE_LP_RING();
-                        }
-                }
-        }
-
-        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-        mutex_unlock(&dev->struct_mutex);
-
-        list_for_each_safe(hit, tmp, &hits) {
-                drm_i915_vbl_swap_t *swap_hit =
-                        list_entry(hit, drm_i915_vbl_swap_t, head);
-
-                list_del(hit);
-
-                drm_free(swap_hit, sizeof(*swap_hit), DRM_MEM_DRIVER);
-        }
-}
-
 /* Called from drm generic code, passed a 'crtc', which
  * we use as a pipe index
  */
@@ -322,40 +117,6 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
         return count;
 }
 
-void
-i915_vblank_work_handler(struct work_struct *work)
-{
-        drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
-                                                    vblank_work);
-        struct drm_device *dev = dev_priv->dev;
-        unsigned long irqflags;
-
-        if (dev->lock.hw_lock == NULL) {
-                i915_vblank_tasklet(dev);
-                return;
-        }
-
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-        dev->locked_tasklet_func = i915_vblank_tasklet;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-
-        /* Try to get the lock now, if this fails, the lock
-         * holder will execute the tasklet during unlock
-         */
-        if (!drm_lock_take(&dev->lock, DRM_KERNEL_CONTEXT))
-                return;
-
-        dev->lock.lock_time = jiffies;
-        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
-
-        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
-        dev->locked_tasklet_func = NULL;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-
-        i915_vblank_tasklet(dev);
-        drm_lock_free(&dev->lock, DRM_KERNEL_CONTEXT);
-}
-
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
@@ -433,9 +194,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
         if (iir & I915_ASLE_INTERRUPT)
                 opregion_asle_intr(dev);
 
-        if (vblank && dev_priv->swaps_pending > 0)
-                schedule_work(&dev_priv->vblank_work);
-
         return IRQ_HANDLED;
 }
 
@@ -454,12 +212,10 @@ static int i915_emit_irq(struct drm_device * dev)
         if (dev_priv->sarea_priv)
                 dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
 
-        BEGIN_LP_RING(6);
+        BEGIN_LP_RING(4);
         OUT_RING(MI_STORE_DWORD_INDEX);
-        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
+        OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
-        OUT_RING(0);
-        OUT_RING(0);
         OUT_RING(MI_USER_INTERRUPT);
         ADVANCE_LP_RING();
 
@@ -696,123 +452,21 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
 int i915_vblank_swap(struct drm_device *dev, void *data,
                      struct drm_file *file_priv)
 {
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_i915_vblank_swap_t *swap = data;
-        drm_i915_vbl_swap_t *vbl_swap, *vbl_old;
-        unsigned int pipe, seqtype, curseq;
-        unsigned long irqflags;
-        struct list_head *list;
-        int ret;
-
-        if (!dev_priv || !dev_priv->sarea_priv) {
-                DRM_ERROR("%s called with no initialization\n", __func__);
-                return -EINVAL;
-        }
-
-        if (dev_priv->sarea_priv->rotation) {
-                DRM_DEBUG("Rotation not supported\n");
-                return -EINVAL;
-        }
-
-        if (swap->seqtype & ~(_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE |
-                             _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)) {
-                DRM_ERROR("Invalid sequence type 0x%x\n", swap->seqtype);
-                return -EINVAL;
-        }
-
-        pipe = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
-
-        seqtype = swap->seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE);
-
-        if (!(dev_priv->vblank_pipe & (1 << pipe))) {
-                DRM_ERROR("Invalid pipe %d\n", pipe);
-                return -EINVAL;
-        }
-
-        spin_lock_irqsave(&dev->drw_lock, irqflags);
-
-        if (!drm_get_drawable_info(dev, swap->drawable)) {
-                spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-                DRM_DEBUG("Invalid drawable ID %d\n", swap->drawable);
-                return -EINVAL;
-        }
-
-        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-
-        /*
-         * We take the ref here and put it when the swap actually completes
-         * in the tasklet.
+        /* The delayed swap mechanism was fundamentally racy, and has been
+         * removed.  The model was that the client requested a delayed flip/swap
+         * from the kernel, then waited for vblank before continuing to perform
+         * rendering.  The problem was that the kernel might wake the client
+         * up before it dispatched the vblank swap (since the lock has to be
+         * held while touching the ringbuffer), in which case the client would
+         * clear and start the next frame before the swap occurred, and
+         * flicker would occur in addition to likely missing the vblank.
+         *
+         * In the absence of this ioctl, userland falls back to a correct path
+         * of waiting for a vblank, then dispatching the swap on its own.
+         * Context switching to userland and back is plenty fast enough for
+         * meeting the requirements of vblank swapping.
          */
-        ret = drm_vblank_get(dev, pipe);
-        if (ret)
-                return ret;
-        curseq = drm_vblank_count(dev, pipe);
-
-        if (seqtype == _DRM_VBLANK_RELATIVE)
-                swap->sequence += curseq;
-
-        if ((curseq - swap->sequence) <= (1<<23)) {
-                if (swap->seqtype & _DRM_VBLANK_NEXTONMISS) {
-                        swap->sequence = curseq + 1;
-                } else {
-                        DRM_DEBUG("Missed target sequence\n");
-                        drm_vblank_put(dev, pipe);
-                        return -EINVAL;
-                }
-        }
-
-        vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-
-        if (!vbl_swap) {
-                DRM_ERROR("Failed to allocate memory to queue swap\n");
-                drm_vblank_put(dev, pipe);
-                return -ENOMEM;
-        }
-
-        vbl_swap->drw_id = swap->drawable;
-        vbl_swap->pipe = pipe;
-        vbl_swap->sequence = swap->sequence;
-
-        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
-
-        list_for_each(list, &dev_priv->vbl_swaps.head) {
-                vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
-
-                if (vbl_old->drw_id == swap->drawable &&
-                    vbl_old->pipe == pipe &&
-                    vbl_old->sequence == swap->sequence) {
-                        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-                        drm_vblank_put(dev, pipe);
-                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-                        DRM_DEBUG("Already scheduled\n");
-                        return 0;
-                }
-        }
-
-        if (dev_priv->swaps_pending >= 10) {
-                DRM_DEBUG("Too many swaps queued\n");
-                DRM_DEBUG(" pipe 0: %d pipe 1: %d\n",
-                          drm_vblank_count(dev, 0),
-                          drm_vblank_count(dev, 1));
-
-                list_for_each(list, &dev_priv->vbl_swaps.head) {
-                        vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
-                        DRM_DEBUG("\tdrw %x pipe %d seq %x\n",
-                                  vbl_old->drw_id, vbl_old->pipe,
-                                  vbl_old->sequence);
-                }
-                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-                drm_vblank_put(dev, pipe);
-                drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-                return -EBUSY;
-        }
-
-        list_add_tail(&vbl_swap->head, &dev_priv->vbl_swaps.head);
-        dev_priv->swaps_pending++;
-
-        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-
-        return 0;
+        return -EINVAL;
 }
 
 /* drm_dma.h hooks
@@ -831,11 +485,6 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         int ret, num_pipes = 2;
 
-        spin_lock_init(&dev_priv->swaps_lock);
-        INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
-        INIT_WORK(&dev_priv->vblank_work, i915_vblank_work_handler);
-        dev_priv->swaps_pending = 0;
-
         /* Set initial unmasked IRQs to just the selected vblank pipes. */
         dev_priv->irq_mask_reg = ~0;
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 5c2d9f206d05..0e476eba36e6 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -527,6 +527,9 @@
 #define C0DRB3                  0x10206
 #define C1DRB3                  0x10606
 
+/** GM965 GM45 render standby register */
+#define MCHBAR_RENDER_STANDBY   0x111B8
+
 /*
  * Overlay regs
  */
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 603fe742ccd4..5ddc6e595c0c 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -240,6 +240,10 @@ int i915_save_state(struct drm_device *dev)
 
         pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
 
+        /* Render Standby */
+        if (IS_I965G(dev) && IS_MOBILE(dev))
+                dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY);
+
         /* Display arbitration control */
         dev_priv->saveDSPARB = I915_READ(DSPARB);
 
@@ -365,6 +369,11 @@ int i915_restore_state(struct drm_device *dev)
 
         pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
 
+        /* Render Standby */
+        if (IS_I965G(dev) && IS_MOBILE(dev))
+                I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY);
+
+        /* Display arbitration */
         I915_WRITE(DSPARB, dev_priv->saveDSPARB);
 
         /* Pipe & plane A info */
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 59a2132a8f57..abdc1ae38467 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -653,15 +653,16 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
         RADEON_WRITE(RADEON_SCRATCH_UMSK, 0x7);
 
         /* Turn on bus mastering */
-        if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) ||
-            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) ||
+        if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) ||
             ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS740)) {
-                /* rs400, rs690/rs740 */
-                tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RS400_BUS_MASTER_DIS;
+                /* rs600/rs690/rs740 */
+                tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RS600_BUS_MASTER_DIS;
                 RADEON_WRITE(RADEON_BUS_CNTL, tmp);
-        } else if (!(((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV380) ||
-                    ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R423))) {
-                /* r1xx, r2xx, r300, r(v)350, r420/r481, rs480 */
+        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV350) ||
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R420) ||
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) ||
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) {
+                /* r1xx, r2xx, r300, r(v)350, r420/r481, rs400/rs480 */
                 tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
                 RADEON_WRITE(RADEON_BUS_CNTL, tmp);
         } /* PCIE cards appears to not need this */
@@ -1750,6 +1751,12 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
         else
                 dev_priv->flags |= RADEON_IS_PCI;
 
+        ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
+                         drm_get_resource_len(dev, 2), _DRM_REGISTERS,
+                         _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
+        if (ret != 0)
+                return ret;
+
         DRM_DEBUG("%s card detected\n",
                   ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
         return ret;
@@ -1766,12 +1773,6 @@ int radeon_driver_firstopen(struct drm_device *dev)
 
         dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
 
-        ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
-                         drm_get_resource_len(dev, 2), _DRM_REGISTERS,
-                         _DRM_READ_ONLY, &dev_priv->mmio);
-        if (ret != 0)
-                return ret;
-
         dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
         ret = drm_addmap(dev, dev_priv->fb_aper_offset,
                          drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
@@ -1787,6 +1788,9 @@ int radeon_driver_unload(struct drm_device *dev)
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
         DRM_DEBUG("\n");
+
+        drm_rmmap(dev, dev_priv->mmio);
+
         drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
         dev->dev_private = NULL;
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 4dbb813910c3..7a183789be97 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -287,7 +287,6 @@ typedef struct drm_radeon_private {
         unsigned long gart_textures_offset;
 
         drm_local_map_t *sarea;
-        drm_local_map_t *mmio;
         drm_local_map_t *cp_ring;
         drm_local_map_t *ring_rptr;
         drm_local_map_t *gart_textures;
@@ -318,6 +317,7 @@ typedef struct drm_radeon_private {
 
         int num_gb_pipes;
         int track_flush;
+        drm_local_map_t *mmio;
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {
@@ -447,12 +447,12 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev,
  * handling, not bus mastering itself.
  */
 #define RADEON_BUS_CNTL                 0x0030
-/* r1xx, r2xx, r300, r(v)350, r420/r481, rs480 */
+/* r1xx, r2xx, r300, r(v)350, r420/r481, rs400/rs480 */
 #       define RADEON_BUS_MASTER_DIS            (1 << 6)
-/* rs400, rs690/rs740 */
-#       define RS400_BUS_MASTER_DIS             (1 << 14)
-#       define RS400_MSI_REARM                  (1 << 20)
-/* see RS480_MSI_REARM in AIC_CNTL for rs480 */
+/* rs600/rs690/rs740 */
+#       define RS600_BUS_MASTER_DIS             (1 << 14)
+#       define RS600_MSI_REARM                  (1 << 20)
+/* see RS400_MSI_REARM in AIC_CNTL for rs480 */
 
 #define RADEON_BUS_CNTL1                0x0034
 #       define RADEON_PMI_BM_DIS                (1 << 2)
@@ -937,7 +937,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device *dev,
 
 #define RADEON_AIC_CNTL                 0x01d0
 #       define RADEON_PCIGART_TRANSLATE_EN      (1 << 0)
-#       define RS480_MSI_REARM                  (1 << 3)
+#       define RS400_MSI_REARM                  (1 << 3)
 #define RADEON_AIC_STAT                 0x01d4
 #define RADEON_AIC_PT_BASE              0x01d8
 #define RADEON_AIC_LO_ADDR              0x01dc
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f5999a91614e..b4fd8ca701a4 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -247,7 +247,6 @@ config HID_SUNPLUS
 
 config THRUSTMASTER_FF
         tristate "ThrustMaster devices support"
-        default m
         depends on USB_HID
         select INPUT_FF_MEMLESS
         help
@@ -256,7 +255,6 @@ config THRUSTMASTER_FF
 
 config ZEROPLUS_FF
         tristate "Zeroplus based game controller support"
-        default m
         depends on USB_HID
         select INPUT_FF_MEMLESS
         help
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index fd7f896b34f7..c6ab4ba60c52 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -312,13 +312,6 @@ static int apple_probe(struct hid_device *hdev,
         unsigned int connect_mask = HID_CONNECT_DEFAULT;
         int ret;
 
-        /* return something else or move to hid layer? device will reside
-           allocated */
-        if (id->bus == BUS_USB && (quirks & APPLE_IGNORE_MOUSE) &&
-                        to_usb_interface(hdev->dev.parent)->cur_altsetting->
-                        desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)
-                return -ENODEV;
-
         asc = kzalloc(sizeof(*asc), GFP_KERNEL);
         if (asc == NULL) {
                 dev_err(&hdev->dev, "can't alloc apple descriptor\n");
@@ -367,38 +360,32 @@ static const struct hid_device_id apple_devices[] = {
                 .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
 
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS},
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
                 .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
@@ -406,14 +393,12 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),
                 .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
@@ -422,25 +407,21 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
-                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
-                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
         /* Apple wireless Mighty Mouse */
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 721a36d97582..d3671b4049c0 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1263,7 +1263,10 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
@@ -1275,8 +1278,6 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },
@@ -1295,6 +1296,7 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
@@ -1406,6 +1408,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},
+        { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2)},
         { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
@@ -1541,6 +1544,40 @@ static const struct hid_device_id hid_ignore_list[] = {
         { }
 };
 
+/**
+ * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer
+ *
+ * There are composite devices for which we want to ignore only a certain
+ * interface. This is a list of devices for which only the mouse interface will
+ * be ignored. This allows a dedicated driver to take care of the interface.
+ */
+static const struct hid_device_id hid_mouse_ignore_list[] = {
+        /* appletouch driver */
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+        { }
+};
+
 static bool hid_ignore(struct hid_device *hdev)
 {
         switch (hdev->vendor) {
@@ -1557,6 +1594,10 @@ static bool hid_ignore(struct hid_device *hdev)
                 break;
         }
 
+        if (hdev->type == HID_TYPE_USBMOUSE &&
+                        hid_match_id(hdev, hid_mouse_ignore_list))
+                return true;
+
         return !!hid_match_id(hdev, hid_ignore_list);
 }
 
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 1a0d0dfc62fc..f5474300b83a 100644
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -48,6 +48,7 @@ err_free:
 static const struct hid_device_id dell_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c
index ac5120f542cc..04a0afec52ac 100644
--- a/drivers/hid/hid-gyration.c
+++ b/drivers/hid/hid-gyration.c
@@ -4,9 +4,9 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2007 Jiri Kosina
  *  Copyright (c) 2007 Paul Walmsley
  *  Copyright (c) 2008 Jiri Slaby
+ *  Copyright (c) 2006-2008 Jiri Kosina
  */
 
 /*
@@ -40,6 +40,7 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         case 0x025: gy_map_key_clear(KEY_PVR);          break;
         case 0x046: gy_map_key_clear(KEY_MEDIA);        break;
         case 0x047: gy_map_key_clear(KEY_MP3);          break;
+        case 0x048: gy_map_key_clear(KEY_MEDIA);        break;
         case 0x049: gy_map_key_clear(KEY_CAMERA);       break;
         case 0x04a: gy_map_key_clear(KEY_VIDEO);        break;
 
@@ -68,6 +69,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field,
 
 static const struct hid_device_id gyration_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, gyration_devices);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d9a1ba920c23..f05bcbbbb0d5 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -89,6 +89,7 @@
 
 #define USB_VENDOR_ID_ASUS              0x0b05
 #define USB_DEVICE_ID_ASUS_LCM          0x1726
+#define USB_DEVICE_ID_ASUS_LCM2         0x175b
 
 #define USB_VENDOR_ID_ATEN              0x0557
 #define USB_DEVICE_ID_ATEN_UC100KM      0x2004
@@ -162,6 +163,9 @@
 
 #define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
 
+#define USB_VENDOR_ID_GENERIC_13BA      0x13ba
+#define USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE    0x0017
+
 #define USB_VENDOR_ID_GLAB              0x06c2
 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
 #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
@@ -236,6 +240,7 @@
 
 #define USB_VENDOR_ID_GYRATION          0x0c16
 #define USB_DEVICE_ID_GYRATION_REMOTE   0x0002
+#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
 
 #define USB_VENDOR_ID_HAPP              0x078b
 #define USB_DEVICE_ID_UGCI_DRIVING      0x0010
@@ -248,6 +253,9 @@
 #define USB_VENDOR_ID_KBGEAR            0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
 
+#define USB_VENDOR_ID_KWORLD            0x1b80
+#define USB_DEVICE_ID_KWORLD_RADIO_FM700        0xd700
+
 #define USB_VENDOR_ID_LABTEC            0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
 
@@ -268,8 +276,6 @@
 #define USB_DEVICE_ID_LD_MACHINETEST    0x2040
 
 #define USB_VENDOR_ID_LOGITECH          0x046d
-#define USB_DEVICE_ID_LOGITECH_LX3      0xc044
-#define USB_DEVICE_ID_LOGITECH_V150     0xc047
 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
 #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
 #define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
@@ -350,6 +356,7 @@
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
 
 #define USB_VENDOR_ID_SONY                      0x054c
+#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE       0x024b
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER       0x0268
 
 #define USB_VENDOR_ID_SOUNDGRAPH        0x15c2
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 406d8c82abf1..2bae340eafe2 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -287,11 +287,6 @@ static const struct hid_device_id lg_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500),
                 .driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },
 
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3),
-                .driver_data = LG_INVERT_HWHEEL },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150),
-                .driver_data = LG_INVERT_HWHEEL },
-
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D),
                 .driver_data = LG_NOGET },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL),
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 3af8095a7de1..86e563b8d644 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -4,9 +4,9 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2007 Jiri Kosina
  *  Copyright (c) 2007 Paul Walmsley
  *  Copyright (c) 2008 Jiri Slaby
+ *  Copyright (c) 2006-2008 Jiri Kosina
  */
 
 /*
@@ -23,6 +23,26 @@
 
 #include "hid-ids.h"
 
+#define VAIO_RDESC_CONSTANT 0x0001
+
+struct sony_sc {
+        unsigned long quirks;
+};
+
+/* Sony Vaio VGX has wrongly mouse pointer declared as constant */
+static void sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        struct sony_sc *sc = hid_get_drvdata(hdev);
+
+        if ((sc->quirks & VAIO_RDESC_CONSTANT) &&
+                        rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {
+                dev_info(&hdev->dev, "Fixing up Sony Vaio VGX report "
+                                "descriptor\n");
+                rdesc[55] = 0x06;
+        }
+}
+
 /*
  * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
  * to "operational".  Without this, the ps3 controller will not report any
@@ -56,6 +76,17 @@ static int sony_set_operational(struct hid_device *hdev)
 static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
         int ret;
+        unsigned long quirks = id->driver_data;
+        struct sony_sc *sc;
+
+        sc = kzalloc(sizeof(*sc), GFP_KERNEL);
+        if (sc == NULL) {
+                dev_err(&hdev->dev, "can't alloc apple descriptor\n");
+                return -ENOMEM;
+        }
+
+        sc->quirks = quirks;
+        hid_set_drvdata(hdev, sc);
 
         ret = hid_parse(hdev);
         if (ret) {
@@ -78,11 +109,20 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 err_stop:
         hid_hw_stop(hdev);
 err_free:
+        kfree(sc);
         return ret;
 }
 
+static void sony_remove(struct hid_device *hdev)
+{
+        hid_hw_stop(hdev);
+        kfree(hid_get_drvdata(hdev));
+}
+
 static const struct hid_device_id sony_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),
+                .driver_data = VAIO_RDESC_CONSTANT },
         { }
 };
 MODULE_DEVICE_TABLE(hid, sony_devices);
@@ -91,6 +131,8 @@ static struct hid_driver sony_driver = {
         .name = "sony",
         .id_table = sony_devices,
         .probe = sony_probe,
+        .remove = sony_remove,
+        .report_fixup = sony_report_fixup,
 };
 
 static int sony_init(void)
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index af3edb98df43..894d52e05bf9 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -264,6 +264,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
                 default:
                         ret = -ENOTTY;
         }
+        unlock_kernel();
         return ret;
 }
 
@@ -403,7 +404,7 @@ out:
         return result;
 }
 
-void __exit hidraw_exit(void)
+void hidraw_exit(void)
 {
         dev_t dev_id = MKDEV(hidraw_major, 0);
 
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 705a43cdeea4..18e5ddd722cd 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
@@ -776,21 +777,10 @@ static int usbhid_start(struct hid_device *hid)
         struct usb_interface *intf = to_usb_interface(hid->dev.parent);
         struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct usbhid_device *usbhid;
+        struct usbhid_device *usbhid = hid->driver_data;
         unsigned int n, insize = 0;
         int ret;
 
-        WARN_ON(hid->driver_data);
-
-        usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);
-        if (usbhid == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        hid->driver_data = usbhid;
-        usbhid->hid = hid;
-
         usbhid->bufsize = HID_MIN_BUFFER_SIZE;
         hid_find_max_report(hid, HID_INPUT_REPORT, &usbhid->bufsize);
         hid_find_max_report(hid, HID_OUTPUT_REPORT, &usbhid->bufsize);
@@ -804,6 +794,7 @@ static int usbhid_start(struct hid_device *hid)
         if (insize > HID_MAX_BUFFER_SIZE)
                 insize = HID_MAX_BUFFER_SIZE;
 
+        mutex_lock(&usbhid->setup);
         if (hid_alloc_buffers(dev, hid)) {
                 ret = -ENOMEM;
                 goto fail;
@@ -888,6 +879,9 @@ static int usbhid_start(struct hid_device *hid)
         usbhid_init_reports(hid);
         hid_dump_device(hid);
 
+        set_bit(HID_STARTED, &usbhid->iofl);
+        mutex_unlock(&usbhid->setup);
+
         return 0;
 
 fail:
@@ -895,8 +889,7 @@ fail:
         usb_free_urb(usbhid->urbout);
         usb_free_urb(usbhid->urbctrl);
         hid_free_buffers(dev, hid);
-        kfree(usbhid);
-err:
+        mutex_unlock(&usbhid->setup);
         return ret;
 }
 
@@ -907,6 +900,8 @@ static void usbhid_stop(struct hid_device *hid)
         if (WARN_ON(!usbhid))
                 return;
 
+        mutex_lock(&usbhid->setup);
+        clear_bit(HID_STARTED, &usbhid->iofl);
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_DISCONNECTED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
@@ -931,8 +926,7 @@ static void usbhid_stop(struct hid_device *hid)
         usb_free_urb(usbhid->urbout);
 
         hid_free_buffers(hid_to_usb_dev(hid), hid);
-        kfree(usbhid);
-        hid->driver_data = NULL;
+        mutex_unlock(&usbhid->setup);
 }
 
 static struct hid_ll_driver usb_hid_driver = {
@@ -947,6 +941,7 @@ static struct hid_ll_driver usb_hid_driver = {
 static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_device *dev = interface_to_usbdev(intf);
+        struct usbhid_device *usbhid;
         struct hid_device *hid;
         size_t len;
         int ret;
@@ -972,6 +967,9 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
         hid->product = le16_to_cpu(dev->descriptor.idProduct);
         hid->name[0] = 0;
+        if (intf->cur_altsetting->desc.bInterfaceProtocol ==
+                        USB_INTERFACE_PROTOCOL_MOUSE)
+                hid->type = HID_TYPE_USBMOUSE;
 
         if (dev->manufacturer)
                 strlcpy(hid->name, dev->manufacturer, sizeof(hid->name));
@@ -997,14 +995,26 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
                 hid->uniq[0] = 0;
 
+        usbhid = kzalloc(sizeof(*usbhid), GFP_KERNEL);
+        if (usbhid == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        hid->driver_data = usbhid;
+        usbhid->hid = hid;
+        mutex_init(&usbhid->setup); /* needed on suspend/resume */
+
         ret = hid_add_device(hid);
         if (ret) {
                 if (ret != -ENODEV)
                         dev_err(&intf->dev, "can't add hid device: %d\n", ret);
-                goto err;
+                goto err_free;
         }
 
         return 0;
+err_free:
+        kfree(usbhid);
 err:
         hid_destroy_device(hid);
         return ret;
@@ -1013,11 +1023,14 @@ err:
 static void hid_disconnect(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
+        struct usbhid_device *usbhid;
 
         if (WARN_ON(!hid))
                 return;
 
+        usbhid = hid->driver_data;
         hid_destroy_device(hid);
+        kfree(usbhid);
 }
 
 static int hid_suspend(struct usb_interface *intf, pm_message_t message)
@@ -1025,11 +1038,18 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
         struct hid_device *hid = usb_get_intfdata (intf);
         struct usbhid_device *usbhid = hid->driver_data;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_SUSPENDED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
-        del_timer(&usbhid->io_retry);
+        del_timer_sync(&usbhid->io_retry);
         usb_kill_urb(usbhid->urbin);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "suspend\n");
         return 0;
 }
@@ -1040,9 +1060,16 @@ static int hid_resume(struct usb_interface *intf)
         struct usbhid_device *usbhid = hid->driver_data;
         int status;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         clear_bit(HID_SUSPENDED, &usbhid->iofl);
         usbhid->retry_delay = 0;
         status = hid_start_in(hid);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "resume status %d\n", status);
         return status;
 }
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index babd65dd46ad..83e851a5ed30 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -242,8 +242,6 @@ static int hiddev_release(struct inode * inode, struct file * file)
         struct hiddev_list *list = file->private_data;
         unsigned long flags;
 
-        hiddev_fasync(-1, file, 0);
-
         spin_lock_irqsave(&list->hiddev->list_lock, flags);
         list_del(&list->node);
         spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
@@ -436,8 +434,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
                 if (copy_to_user(user_arg, uref, sizeof(*uref)))
                         goto fault;
 
-                kfree(uref_multi);
-                return 0;
+                goto goodreturn;
 
         default:
                 if (cmd != HIDIOCGUSAGE &&
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index abedb13c623e..55973ff54008 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -73,6 +74,7 @@ struct usbhid_device {
         dma_addr_t outbuf_dma;                                          /* Output buffer dma */
         spinlock_t outlock;                                             /* Output fifo spinlock */
 
+        struct mutex setup;
         unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
         struct timer_list io_retry;                                     /* Retry timer */
         unsigned long stop_retry;                                       /* Time to give up, in jiffies */
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index bc011da79e14..be3285912cb7 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -116,6 +116,18 @@ static const char* temperature_sensors_sets[][36] = {
 /* Set 9: Macbook Pro 3,1 (Santa Rosa) */
         { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P",
           "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
+/* Set 10: iMac 5,1 */
+        { "TA0P", "TC0D", "TC0P", "TG0D", "TH0P", "TO0P", "Tm0P", NULL },
+/* Set 11: Macbook 5,1 */
+        { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0P", "TN0D", "TN0P",
+          "TTF0", "Th0H", "Th1H", "ThFH", "Ts0P", "Ts0S", NULL },
+/* Set 12: Macbook Pro 5,1 */
+        { "TB0T", "TB1T", "TB2T", "TB3T", "TC0D", "TC0F", "TC0P", "TG0D",
+          "TG0F", "TG0H", "TG0P", "TG0T", "TG1H", "TN0D", "TN0P", "TTF0",
+          "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL },
+/* Set 13: iMac 8,1 */
+        { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P",
+          "TL0P", "TO0P", "TW0P", "Tm0P", "Tp0P", NULL },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -1276,6 +1288,14 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
         { .accelerometer = 1, .light = 1, .temperature_set = 8 },
 /* MacBook Pro 3: accelerometer, backlight and temperature set 9 */
         { .accelerometer = 1, .light = 1, .temperature_set = 9 },
+/* iMac 5: light sensor only, temperature set 10 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 10 },
+/* MacBook 5: accelerometer, backlight and temperature set 11 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 11 },
+/* MacBook Pro 5: accelerometer, backlight and temperature set 12 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 12 },
+/* iMac 8: light sensor only, temperature set 13 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 13 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
@@ -1285,6 +1305,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
                 &applesmc_dmi_data[7]},
+        { applesmc_dmi_match, "Apple MacBook Pro 5", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5") },
+                &applesmc_dmi_data[12]},
         { applesmc_dmi_match, "Apple MacBook Pro 4", {
           DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
@@ -1305,6 +1329,10 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
                 &applesmc_dmi_data[6]},
+        { applesmc_dmi_match, "Apple MacBook 5", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5") },
+                &applesmc_dmi_data[11]},
         { applesmc_dmi_match, "Apple MacBook", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
@@ -1317,6 +1345,14 @@ static __initdata struct dmi_system_id applesmc_whitelist[] = {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
                 &applesmc_dmi_data[4]},
+        { applesmc_dmi_match, "Apple iMac 8", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "iMac8") },
+                &applesmc_dmi_data[13]},
+        { applesmc_dmi_match, "Apple iMac 5", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "iMac5") },
+                &applesmc_dmi_data[10]},
         { applesmc_dmi_match, "Apple iMac", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index c772e02c2803..1fac4e233133 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -507,7 +507,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
         unsigned long timeout;
         int ret;
 
-        if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+        if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
                 return -EIO;
 
         ret = s3c24xx_i2c_set_master(i2c);
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index c3022a023449..e4c98539c517 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 
 static struct i2c_adapter scx200_i2c_ops = {
         .owner             = THIS_MODULE,
+        .class             = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .id                = I2C_HW_B_SCX200,
         .algo_data         = &scx200_i2c_data,
         .name   = "NatSemi SCx200 I2C",
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index daf9dce39e52..e56c7b72f9e2 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -5,7 +5,7 @@
  *
  *  Copyright (C) 1998-2000 Andre Hedrick (andre@linux-ide.org)
  *  May be copied or modified under the terms of the GNU General Public License
- *  Copyright (C) 2002 Alan Cox <alan@redhat.com>
+ *  Copyright (C) 2002 Alan Cox
  *  ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw>
  *  Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>
  *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index a7909e9c720e..f5afd46ed51c 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -52,7 +52,7 @@
  * different clocks on read/write. This requires overloading rw_disk and
  * other deeply crazy things. Thanks to <http://www.hoerstreich.de> for
  * keeping me sane. 
- *              Alan Cox <alan@redhat.com>
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * - fix the clock turnaround code: it was writing to the wrong ports when
  *   called for the secondary channel, caching the current clock mode per-
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 48b5eda3ab41..42ab6d8715f2 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1250,7 +1250,8 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                  * separate masks.
                  */
                 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
-                if ((unsigned long)buf & alignment || rq->data_len & alignment
+                if ((unsigned long)buf & alignment
+                    || rq->data_len & q->dma_pad_mask
                     || object_is_on_stack(buf))
                         drive->dma = 0;
         }
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index e5adebe8ac2c..eb9fac4d0f0c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -2,7 +2,7 @@
  *  Copyright (C) 1994-1998        Linus Torvalds & authors (see below)
  *  Copyright (C) 1998-2002        Linux ATA Development
  *                                    Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003             Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003             Red Hat
  *  Copyright (C) 2003-2005, 2007  Bartlomiej Zolnierkiewicz
  */
 
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 7b6662854374..b8078b3231f7 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -281,7 +281,12 @@ static int ide_gd_media_changed(struct gendisk *disk)
 static int ide_gd_revalidate_disk(struct gendisk *disk)
 {
         struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj);
-        set_capacity(disk, ide_gd_capacity(idkp->drive));
+        ide_drive_t *drive = idkp->drive;
+
+        if (ide_gd_media_changed(disk))
+                drive->disk_ops->get_capacity(drive);
+
+        set_capacity(disk, ide_gd_capacity(drive));
         return 0;
 }
 
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index bb7a1ed8094e..5d6ba14e211d 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2000-2002     Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003          Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003          Red Hat
  *
  */
 
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index 474f96a7c076..bddae2b329a0 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2001-2002     Andre Hedrick <andre@linux-ide.org>
- *  Portions (C) Copyright 2002  Red Hat Inc <alan@redhat.com>
+ *  Portions (C) Copyright 2002  Red Hat Inc
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index c31d0dd7a532..f3cddd1b2f8f 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 1997-1998     Mark Lord
- *  Copyright (C) 2003          Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003          Red Hat
  *
  *  Some code was moved here from ide.c, see it for original copyrights.
  */
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index 995e18bb3139..ef004089761b 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004           Red Hat <alan@redhat.com>
+ * Copyright (C) 2004           Red Hat
  * Copyright (C) 2007           Bartlomiej Zolnierkiewicz
  *
  *  May be copied or modified under the terms of the GNU General Public License
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index 9a68433cf46d..bf2be6431b20 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2006           Red Hat <alan@redhat.com>
+ * Copyright (C) 2006           Red Hat
  *
  *  May be copied or modified under the terms of the GNU General Public License
  */
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index d63f9fdca76b..61d2d920a5cd 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
  *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat
  *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
  *
  *  May be copied or modified under the terms of the GNU General Public License
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index f26aa5d54efb..0f48f9dacfa5 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -5,7 +5,7 @@
  *
  * This code is based on drivers/ide/pci/siimage.c:
  * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
- * Copyright (C) 2003           Red Hat <alan@redhat.com>
+ * Copyright (C) 2003           Red Hat
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
index c3107df7773d..7d622d20bc4c 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
- * Copyright (C) 2003           Red Hat <alan@redhat.com>
+ * Copyright (C) 2003           Red Hat
  * Copyright (C) 2007-2008      MontaVista Software, Inc.
  * Copyright (C) 2007-2008      Bartlomiej Zolnierkiewicz
  *
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index fa660f931a11..9120063e8f87 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -26,12 +26,13 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
         unsigned int sp = (cr >> 4) & 3;
         unsigned int clock = gbus_clock / (4 - sp);
         unsigned int cycle = 1000000000 / clock;
-        unsigned int wt, shwt;
+        unsigned int shwt;
+        int wt;
 
         /* Minimum DIOx- active time */
         wt = DIV_ROUND_UP(t->act8b, cycle) - 2;
         /* IORDY setup time: 35ns */
-        wt = max(wt, DIV_ROUND_UP(35, cycle));
+        wt = max_t(int, wt, DIV_ROUND_UP(35, cycle));
         /* actual wait-cycle is max(wt & ~1, 1) */
         if (wt > 2 && (wt & 1))
                 wt++;
@@ -39,10 +40,17 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
         /* Address-valid to DIOR/DIOW setup */
         shwt = DIV_ROUND_UP(t->setup, cycle);
 
+        /* -DIOx recovery time (SHWT * 4) and cycle time requirement */
+        while ((shwt * 4 + wt + (wt ? 2 : 3)) * cycle < t->cycle)
+                shwt++;
+        if (shwt > 7) {
+                pr_warning("tx4938ide: SHWT violation (%d)\n", shwt);
+                shwt = 7;
+        }
         pr_debug("tx4938ide: ebus %d, bus cycle %dns, WT %d, SHWT %d\n",
                  ebus_ch, cycle, wt, shwt);
 
-        __raw_writeq((cr & ~(0x3f007ull)) | (wt << 12) | shwt,
+        __raw_writeq((cr & ~0x3f007ull) | (wt << 12) | shwt,
                      &tx4938_ebuscptr->cr[ebus_ch]);
 }
 
@@ -228,7 +236,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
         struct resource *res;
         struct tx4938ide_platform_info *pdata = pdev->dev.platform_data;
         int irq, ret, i;
-        unsigned long mapbase;
+        unsigned long mapbase, mapctl;
         struct ide_port_info d = tx4938ide_port_info;
 
         irq = platform_get_irq(pdev, 0);
@@ -242,38 +250,43 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
                                      res->end - res->start + 1, "tx4938ide"))
                 return -EBUSY;
         mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
-                                              res->end - res->start + 1);
-        if (!mapbase)
+                                              8 << pdata->ioport_shift);
+        mapctl = (unsigned long)devm_ioremap(&pdev->dev,
+                                             res->start + 0x10000 +
+                                             (6 << pdata->ioport_shift),
+                                             1 << pdata->ioport_shift);
+        if (!mapbase || !mapctl)
                 return -EBUSY;
 
         memset(&hw, 0, sizeof(hw));
         if (pdata->ioport_shift) {
                 unsigned long port = mapbase;
+                unsigned long ctl = mapctl;
 
                 hw.io_ports_array[0] = port;
 #ifdef __BIG_ENDIAN
                 port++;
+                ctl++;
 #endif
                 for (i = 1; i <= 7; i++)
                         hw.io_ports_array[i] =
                                 port + (i << pdata->ioport_shift);
-                hw.io_ports.ctl_addr =
-                        port + 0x10000 + (6 << pdata->ioport_shift);
+                hw.io_ports.ctl_addr = ctl;
         } else
-                ide_std_init_ports(&hw, mapbase, mapbase + 0x10006);
+                ide_std_init_ports(&hw, mapbase, mapctl);
         hw.irq = irq;
         hw.dev = &pdev->dev;
 
-        pr_info("TX4938 IDE interface (base %#lx, irq %d)\n", mapbase, hw.irq);
+        pr_info("TX4938 IDE interface (base %#lx, ctl %#lx, irq %d)\n",
+                mapbase, mapctl, hw.irq);
         if (pdata->gbus_clock)
                 tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, 0);
         else
                 d.port_ops = NULL;
         ret = ide_host_add(&d, hws, &host);
-        if (ret)
-                return ret;
-        platform_set_drvdata(pdev, host);
-        return 0;
+        if (!ret)
+                platform_set_drvdata(pdev, host);
+        return ret;
 }
 
 static int __exit tx4938ide_remove(struct platform_device *pdev)
diff --git a/drivers/idle/Kconfig b/drivers/idle/Kconfig
index f5b26dd579e4..108264de0ac9 100644
--- a/drivers/idle/Kconfig
+++ b/drivers/idle/Kconfig
@@ -5,12 +5,13 @@ config I7300_IDLE_IOAT_CHANNEL
         bool
 
 config I7300_IDLE
-        tristate "Intel chipset idle power saving driver"
+        tristate "Intel chipset idle memory power saving driver"
         select I7300_IDLE_IOAT_CHANNEL
-        depends on X86_64
+        depends on X86_64 && EXPERIMENTAL
         help
-          Enable idle power savings with certain Intel server chipsets.
-          The chipset must have I/O AT support, such as the Intel 7300.
-          The power savings depends on the type and quantity of DRAM devices.
+          Enable memory power savings when idle with certain Intel server
+          chipsets. The chipset must have I/O AT support, such as the
+          Intel 7300. The power savings depends on the type and quantity of
+          DRAM devices.
 
 endmenu
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c
index 59d1bbc3cd3c..fb176f6ef9f8 100644
--- a/drivers/idle/i7300_idle.c
+++ b/drivers/idle/i7300_idle.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/debugfs.h>
 #include <linux/stop_machine.h>
+#include <linux/i7300_idle.h>
 
 #include <asm/idle.h>
 
@@ -34,6 +35,8 @@
 #define I7300_IDLE_DRIVER_VERSION       "1.55"
 #define I7300_PRINT                     "i7300_idle:"
 
+#define MAX_STOP_RETRIES        10
+
 static int debug;
 module_param_named(debug, debug, uint, 0644);
 MODULE_PARM_DESC(debug, "Enable debug printks in this driver");
@@ -46,12 +49,12 @@ MODULE_PARM_DESC(debug, "Enable debug printks in this driver");
  *  0 = No throttling
  *  1 = Throttle when > 4 activations per eval window (Maximum throttling)
  *  2 = Throttle when > 8 activations
- *  168 = Throttle when > 168 activations (Minimum throttling)
+ *  168 = Throttle when > 672 activations (Minimum throttling)
  */
-#define MAX_THRTLWLIMIT         168
-static uint i7300_idle_thrtlowlm = 1;
-module_param_named(thrtlwlimit, i7300_idle_thrtlowlm, uint, 0644);
-MODULE_PARM_DESC(thrtlwlimit,
+#define MAX_THROTTLE_LOW_LIMIT          168
+static uint throttle_low_limit = 1;
+module_param_named(throttle_low_limit, throttle_low_limit, uint, 0644);
+MODULE_PARM_DESC(throttle_low_limit,
                 "Value for THRTLOWLM activation field "
                 "(0 = disable throttle, 1 = Max throttle, 168 = Min throttle)");
 
@@ -110,9 +113,9 @@ static int i7300_idle_ioat_start(void)
 static void i7300_idle_ioat_stop(void)
 {
         int i;
-        u8 sts;
+        u64 sts;
 
-        for (i = 0; i < 5; i++) {
+        for (i = 0; i < MAX_STOP_RETRIES; i++) {
                 writeb(IOAT_CHANCMD_RESET,
                         ioat_chanbase + IOAT1_CHANCMD_OFFSET);
 
@@ -126,9 +129,10 @@ static void i7300_idle_ioat_stop(void)
 
         }
 
-        if (i == 5)
-                dprintk("failed to suspend+reset I/O AT after 5 retries\n");
-
+        if (i == MAX_STOP_RETRIES) {
+                dprintk("failed to stop I/O AT after %d retries\n",
+                        MAX_STOP_RETRIES);
+        }
 }
 
 /* Test I/O AT by copying 1024 byte from 2k to 1k */
@@ -275,7 +279,7 @@ static void __exit i7300_idle_ioat_exit(void)
         i7300_idle_ioat_stop();
 
         /* Wait for a while for the channel to halt before releasing */
-        for (i = 0; i < 10; i++) {
+        for (i = 0; i < MAX_STOP_RETRIES; i++) {
                 writeb(IOAT_CHANCMD_RESET,
                        ioat_chanbase + IOAT1_CHANCMD_OFFSET);
 
@@ -389,9 +393,9 @@ static void i7300_idle_start(void)
         new_ctl = i7300_idle_thrtctl_saved & ~DIMM_THRTCTL_THRMHUNT;
         pci_write_config_byte(fbd_dev, DIMM_THRTCTL, new_ctl);
 
-        limit = i7300_idle_thrtlowlm;
-        if (unlikely(limit > MAX_THRTLWLIMIT))
-                limit = MAX_THRTLWLIMIT;
+        limit = throttle_low_limit;
+        if (unlikely(limit > MAX_THROTTLE_LOW_LIMIT))
+                limit = MAX_THROTTLE_LOW_LIMIT;
 
         pci_write_config_byte(fbd_dev, DIMM_THRTLOW, limit);
 
@@ -440,7 +444,7 @@ static int i7300_idle_notifier(struct notifier_block *nb, unsigned long val,
         static ktime_t idle_begin_time;
         static int time_init = 1;
 
-        if (!i7300_idle_thrtlowlm)
+        if (!throttle_low_limit)
                 return 0;
 
         if (unlikely(time_init)) {
@@ -505,77 +509,8 @@ static struct notifier_block i7300_idle_nb = {
         .notifier_call = i7300_idle_notifier,
 };
 
-/*
- * I/O AT controls (PCI bus 0 device 8 function 0)
- * DIMM controls (PCI bus 0 device 16 function 1)
- */
-#define IOAT_BUS 0
-#define IOAT_DEVFN PCI_DEVFN(8, 0)
-#define MEMCTL_BUS 0
-#define MEMCTL_DEVFN PCI_DEVFN(16, 1)
-
-struct fbd_ioat {
-        unsigned int vendor;
-        unsigned int ioat_dev;
-};
-
-/*
- * The i5000 chip-set has the same hooks as the i7300
- * but support is disabled by default because this driver
- * has not been validated on that platform.
- */
-#define SUPPORT_I5000 0
-
-static const struct fbd_ioat fbd_ioat_list[] = {
-        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT_CNB},
-#if SUPPORT_I5000
-        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT},
-#endif
-        {0, 0}
-};
-
-/* table of devices that work with this driver */
-static const struct pci_device_id pci_tbl[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_FBD_CNB) },
-#if SUPPORT_I5000
-        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
-#endif
-        { } /* Terminating entry */
-};
-
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
-/* Check for known platforms with I/O-AT */
-static int __init i7300_idle_platform_probe(void)
-{
-        int i;
-
-        fbd_dev = pci_get_bus_and_slot(MEMCTL_BUS, MEMCTL_DEVFN);
-        if (!fbd_dev)
-                return -ENODEV;
-
-        for (i = 0; pci_tbl[i].vendor != 0; i++) {
-                if (fbd_dev->vendor == pci_tbl[i].vendor &&
-                    fbd_dev->device == pci_tbl[i].device) {
-                        break;
-                }
-        }
-        if (pci_tbl[i].vendor == 0)
-                return -ENODEV;
-
-        ioat_dev = pci_get_bus_and_slot(IOAT_BUS, IOAT_DEVFN);
-        if (!ioat_dev)
-                return -ENODEV;
-
-        for (i = 0; fbd_ioat_list[i].vendor != 0; i++) {
-                if (ioat_dev->vendor == fbd_ioat_list[i].vendor &&
-                    ioat_dev->device == fbd_ioat_list[i].ioat_dev) {
-                        return 0;
-                }
-        }
-        return -ENODEV;
-}
-
 int stats_open_generic(struct inode *inode, struct file *fp)
 {
         fp->private_data = inode->i_private;
@@ -617,7 +552,7 @@ static int __init i7300_idle_init(void)
         cpus_clear(idle_cpumask);
         total_us = 0;
 
-        if (i7300_idle_platform_probe())
+        if (i7300_idle_platform_probe(&fbd_dev, &ioat_dev))
                 return -ENODEV;
 
         if (i7300_idle_thrt_save())
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 2f83543a9dfc..c19f23267157 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1270,8 +1270,14 @@ static int dv1394_mmap(struct file *file, struct vm_area_struct *vma)
         struct video_card *video = file_to_video_card(file);
         int retval = -EINVAL;
 
-        /* serialize mmap */
-        mutex_lock(&video->mtx);
+        /*
+         * We cannot use the blocking variant mutex_lock here because .mmap
+         * is called with mmap_sem held, while .ioctl, .read, .write acquire
+         * video->mtx and subsequently call copy_to/from_user which will
+         * grab mmap_sem in case of a page fault.
+         */
+        if (!mutex_trylock(&video->mtx))
+                return -EAGAIN;
 
         if ( ! video_card_initialized(video) ) {
                 retval = do_dv1394_init_default(video);
@@ -1828,9 +1834,6 @@ static int dv1394_release(struct inode *inode, struct file *file)
         /* OK to free the DMA buffer, no more mappings can exist */
         do_dv1394_shutdown(video, 1);
 
-        /* clean up async I/O users */
-        dv1394_fasync(-1, file, 0);
-
         /* give someone else a turn */
         clear_bit(0, &video->open);
 
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 8dd09d850419..237d0c9d69c6 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -155,11 +155,11 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
         memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
         h->device.parent = dev;
         set_dev_node(&h->device, dev_to_node(dev));
-        snprintf(h->device.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+        dev_set_name(&h->device, "fw-host%d", h->id);
 
         h->host_dev.parent = &h->device;
         h->host_dev.class = &hpsb_host_class;
-        snprintf(h->host_dev.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+        dev_set_name(&h->host_dev, "fw-host%d", h->id);
 
         if (device_register(&h->device))
                 goto fail;
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 2376b729e876..9e39f73282ee 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -826,13 +826,11 @@ static struct node_entry *nodemgr_create_node(octlet_t guid,
         memcpy(&ne->device, &nodemgr_dev_template_ne,
                sizeof(ne->device));
         ne->device.parent = &host->device;
-        snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx",
-                 (unsigned long long)(ne->guid));
+        dev_set_name(&ne->device, "%016Lx", (unsigned long long)(ne->guid));
 
         ne->node_dev.parent = &ne->device;
         ne->node_dev.class = &nodemgr_ne_class;
-        snprintf(ne->node_dev.bus_id, BUS_ID_SIZE, "%016Lx",
-                (unsigned long long)(ne->guid));
+        dev_set_name(&ne->node_dev, "%016Lx", (unsigned long long)(ne->guid));
 
         if (device_register(&ne->device))
                 goto fail_devreg;
@@ -932,13 +930,11 @@ static void nodemgr_register_device(struct node_entry *ne,
 
         ud->device.parent = parent;
 
-        snprintf(ud->device.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->device, "%s-%u", dev_name(&ne->device), ud->id);
 
         ud->unit_dev.parent = &ud->device;
         ud->unit_dev.class = &nodemgr_ud_class;
-        snprintf(ud->unit_dev.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->unit_dev, "%s-%u", dev_name(&ne->device), ud->id);
 
         if (device_register(&ud->device))
                 goto fail_devreg;
@@ -953,7 +949,7 @@ static void nodemgr_register_device(struct node_entry *ne,
 fail_classdevreg:
         device_unregister(&ud->device);
 fail_devreg:
-        HPSB_ERR("Failed to create unit %s", ud->device.bus_id);
+        HPSB_ERR("Failed to create unit %s", dev_name(&ud->device));
 }       
 
 
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 9f19ac492106..bf7e761c12b1 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -2268,7 +2268,8 @@ static ssize_t raw1394_write(struct file *file, const char __user * buffer,
                 return -EFAULT;
         }
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         switch (fi->state) {
         case opened:
@@ -2548,7 +2549,8 @@ static int raw1394_mmap(struct file *file, struct vm_area_struct *vma)
         struct file_info *fi = file->private_data;
         int ret;
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         if (fi->iso_state == RAW1394_ISO_INACTIVE)
                 ret = -EINVAL;
@@ -2669,7 +2671,8 @@ static long raw1394_ioctl(struct file *file, unsigned int cmd,
                 break;
         }
 
-        mutex_lock(&fi->state_mutex);
+        if (!mutex_trylock(&fi->state_mutex))
+                return -EAGAIN;
 
         switch (fi->iso_state) {
         case RAW1394_ISO_INACTIVE:
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index d85af1b67027..eb36a81dd09b 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -358,8 +358,6 @@ static int ib_uverbs_event_close(struct inode *inode, struct file *filp)
         }
         spin_unlock_irq(&file->lock);
 
-        ib_uverbs_event_fasync(-1, filp, 0);
-
         if (file->is_async) {
                 ib_unregister_event_handler(&file->uverbs_file->event_handler);
                 kref_put(&file->uverbs_file->ref, ib_uverbs_release_file);
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 3524bef62be6..1070db330d35 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -235,7 +235,6 @@ static int evdev_release(struct inode *inode, struct file *file)
                 evdev_ungrab(evdev, client);
         mutex_unlock(&evdev->mutex);
 
-        evdev_fasync(-1, file, 0);
         evdev_detach_client(evdev, client);
         kfree(client);
 
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 65d7077a75a1..a85b1485e774 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -244,7 +244,6 @@ static int joydev_release(struct inode *inode, struct file *file)
         struct joydev_client *client = file->private_data;
         struct joydev *joydev = client->joydev;
 
-        joydev_fasync(-1, file, 0);
         joydev_detach_client(joydev, client);
         kfree(client);
 
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 82ec6b1b6467..216a559f55ea 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -71,7 +71,6 @@ static int hp_sdc_rtc_ioctl(struct inode *inode, struct file *file,
 static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait);
 
 static int hp_sdc_rtc_open(struct inode *inode, struct file *file);
-static int hp_sdc_rtc_release(struct inode *inode, struct file *file);
 static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on);
 
 static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off,
@@ -414,17 +413,6 @@ static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int hp_sdc_rtc_release(struct inode *inode, struct file *file)
-{
-        /* Turn off interrupts? */
-
-        if (file->f_flags & FASYNC) {
-                hp_sdc_rtc_fasync (-1, file, 0);
-        }
-
-        return 0;
-}
-
 static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on)
 {
         return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue);
@@ -680,7 +668,6 @@ static const struct file_operations hp_sdc_rtc_fops = {
         .poll =         hp_sdc_rtc_poll,
         .ioctl =        hp_sdc_rtc_ioctl,
         .open =         hp_sdc_rtc_open,
-        .release =      hp_sdc_rtc_release,
         .fasync =       hp_sdc_rtc_fasync,
 };
 
diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index ce238f59b3c8..be3a15f5b25d 100644
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -174,5 +174,6 @@ static void __exit sgi_buttons_exit(void)
         platform_driver_unregister(&sgi_buttons_driver);
 }
 
+MODULE_LICENSE("GPL");
 module_init(sgi_buttons_init);
 module_exit(sgi_buttons_exit);
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index f488b6852baf..4e9934259775 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -25,8 +25,8 @@ config MOUSE_PS2
           mice with wheels and extra buttons, Microsoft, Logitech or Genius
           compatible.
 
-          Synaptics TouchPad users might be interested in a specialized
-          XFree86 driver at:
+          Synaptics, ALPS or Elantech TouchPad users might be interested
+          in a specialized Xorg/XFree86 driver at:
                 <http://w1.894.telia.com/~u89404340/touchpad/index.html>
           and a new version of GPM at:
                 <http://www.geocities.com/dt_or/gpm/gpm.html>
@@ -87,6 +87,27 @@ config MOUSE_PS2_TRACKPOINT
 
           If unsure, say Y.
 
+config MOUSE_PS2_ELANTECH
+        bool "Elantech PS/2 protocol extension"
+        depends on MOUSE_PS2
+        help
+          Say Y here if you have an Elantech PS/2 touchpad connected
+          to your system.
+
+          Note that if you enable this driver you will need an updated
+          X.org Synaptics driver that does not require ABS_PRESSURE
+          reports from the touchpad (i.e. post 1.5.0 version). You can
+          grab a patch for the driver here:
+
+          http://userweb.kernel.org/~dtor/synaptics-no-abspressure.patch
+
+          If unsure, say N.
+
+          This driver exposes some configuration registers via sysfs
+          entries. For further information,
+          see <file:Documentation/input/elantech.txt>.
+
+
 config MOUSE_PS2_TOUCHKIT
         bool "eGalax TouchKit PS/2 protocol extension"
         depends on MOUSE_PS2
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
index 8e6e69097801..96f1dd8037f8 100644
--- a/drivers/input/mouse/Makefile
+++ b/drivers/input/mouse/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_MOUSE_GPIO)	+= gpio_mouse.o
 psmouse-objs := psmouse-base.o synaptics.o
 
 psmouse-$(CONFIG_MOUSE_PS2_ALPS)        += alps.o
+psmouse-$(CONFIG_MOUSE_PS2_ELANTECH)    += elantech.o
 psmouse-$(CONFIG_MOUSE_PS2_OLPC)        += hgpk.o
 psmouse-$(CONFIG_MOUSE_PS2_LOGIPS2PP)   += logips2pp.o
 psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK)    += lifebook.o
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
new file mode 100644
index 000000000000..b9a25d57bc5e
--- /dev/null
+++ b/drivers/input/mouse/elantech.c
@@ -0,0 +1,674 @@
+/*
+ * Elantech Touchpad driver (v5)
+ *
+ * Copyright (C) 2007-2008 Arjan Opmeer <arjan@opmeer.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Trademarks are the property of their respective owners.
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/input.h>
+#include <linux/serio.h>
+#include <linux/libps2.h>
+#include "psmouse.h"
+#include "elantech.h"
+
+#define elantech_debug(format, arg...)                          \
+        do {                                                    \
+                if (etd->debug)                                 \
+                        printk(KERN_DEBUG format, ##arg);       \
+        } while (0)
+
+/*
+ * Send a Synaptics style sliced query command
+ */
+static int synaptics_send_cmd(struct psmouse *psmouse, unsigned char c,
+                                unsigned char *param)
+{
+        if (psmouse_sliced_command(psmouse, c) ||
+            ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETINFO)) {
+                pr_err("elantech.c: synaptics_send_cmd query 0x%02x failed.\n", c);
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * A retrying version of ps2_command
+ */
+static int elantech_ps2_command(struct psmouse *psmouse,
+                                unsigned char *param, int command)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        struct elantech_data *etd = psmouse->private;
+        int rc;
+        int tries = ETP_PS2_COMMAND_TRIES;
+
+        do {
+                rc = ps2_command(ps2dev, param, command);
+                if (rc == 0)
+                        break;
+                tries--;
+                elantech_debug("elantech.c: retrying ps2 command 0x%02x (%d).\n",
+                        command, tries);
+                msleep(ETP_PS2_COMMAND_DELAY);
+        } while (tries > 0);
+
+        if (rc)
+                pr_err("elantech.c: ps2 command 0x%02x failed.\n", command);
+
+        return rc;
+}
+
+/*
+ * Send an Elantech style special command to read a value from a register
+ */
+static int elantech_read_reg(struct psmouse *psmouse, unsigned char reg,
+                                unsigned char *val)
+{
+        struct elantech_data *etd = psmouse->private;
+        unsigned char param[3];
+        int rc = 0;
+
+        if (reg < 0x10 || reg > 0x26)
+                return -1;
+
+        if (reg > 0x11 && reg < 0x20)
+                return -1;
+
+        switch (etd->hw_version) {
+        case 1:
+                if (psmouse_sliced_command(psmouse, ETP_REGISTER_READ) ||
+                    psmouse_sliced_command(psmouse, reg) ||
+                    ps2_command(&psmouse->ps2dev, param, PSMOUSE_CMD_GETINFO)) {
+                        rc = -1;
+                }
+                break;
+
+        case 2:
+                if (elantech_ps2_command(psmouse,  NULL, ETP_PS2_CUSTOM_COMMAND) ||
+                    elantech_ps2_command(psmouse,  NULL, ETP_REGISTER_READ) ||
+                    elantech_ps2_command(psmouse,  NULL, ETP_PS2_CUSTOM_COMMAND) ||
+                    elantech_ps2_command(psmouse,  NULL, reg) ||
+                    elantech_ps2_command(psmouse, param, PSMOUSE_CMD_GETINFO)) {
+                        rc = -1;
+                }
+                break;
+        }
+
+        if (rc)
+                pr_err("elantech.c: failed to read register 0x%02x.\n", reg);
+        else
+                *val = param[0];
+
+        return rc;
+}
+
+/*
+ * Send an Elantech style special command to write a register with a value
+ */
+static int elantech_write_reg(struct psmouse *psmouse, unsigned char reg,
+                                unsigned char val)
+{
+        struct elantech_data *etd = psmouse->private;
+        int rc = 0;
+
+        if (reg < 0x10 || reg > 0x26)
+                return -1;
+
+        if (reg > 0x11 && reg < 0x20)
+                return -1;
+
+        switch (etd->hw_version) {
+        case 1:
+                if (psmouse_sliced_command(psmouse, ETP_REGISTER_WRITE) ||
+                    psmouse_sliced_command(psmouse, reg) ||
+                    psmouse_sliced_command(psmouse, val) ||
+                    ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) {
+                        rc = -1;
+                }
+                break;
+
+        case 2:
+                if (elantech_ps2_command(psmouse, NULL, ETP_PS2_CUSTOM_COMMAND) ||
+                    elantech_ps2_command(psmouse, NULL, ETP_REGISTER_WRITE) ||
+                    elantech_ps2_command(psmouse, NULL, ETP_PS2_CUSTOM_COMMAND) ||
+                    elantech_ps2_command(psmouse, NULL, reg) ||
+                    elantech_ps2_command(psmouse, NULL, ETP_PS2_CUSTOM_COMMAND) ||
+                    elantech_ps2_command(psmouse, NULL, val) ||
+                    elantech_ps2_command(psmouse, NULL, PSMOUSE_CMD_SETSCALE11)) {
+                        rc = -1;
+                }
+                break;
+        }
+
+        if (rc)
+                pr_err("elantech.c: failed to write register 0x%02x with value 0x%02x.\n",
+                        reg, val);
+
+        return rc;
+}
+
+/*
+ * Dump a complete mouse movement packet to the syslog
+ */
+static void elantech_packet_dump(unsigned char *packet, int size)
+{
+        int     i;
+
+        printk(KERN_DEBUG "elantech.c: PS/2 packet [");
+        for (i = 0; i < size; i++)
+                printk("%s0x%02x ", (i) ? ", " : " ", packet[i]);
+        printk("]\n");
+}
+
+/*
+ * Interpret complete data packets and report absolute mode input events for
+ * hardware version 1. (4 byte packets)
+ */
+static void elantech_report_absolute_v1(struct psmouse *psmouse)
+{
+        struct input_dev *dev = psmouse->dev;
+        struct elantech_data *etd = psmouse->private;
+        unsigned char *packet = psmouse->packet;
+        int fingers;
+
+        if (etd->fw_version_maj == 0x01) {
+                /* byte 0:  D   U  p1  p2   1  p3   R   L
+                   byte 1:  f   0  th  tw  x9  x8  y9  y8 */
+                fingers = ((packet[1] & 0x80) >> 7) +
+                                ((packet[1] & 0x30) >> 4);
+        } else {
+                /* byte 0: n1  n0  p2  p1   1  p3   R   L
+                   byte 1:  0   0   0   0  x9  x8  y9  y8 */
+                fingers = (packet[0] & 0xc0) >> 6;
+        }
+
+        input_report_key(dev, BTN_TOUCH, fingers != 0);
+
+        /* byte 2: x7  x6  x5  x4  x3  x2  x1  x0
+           byte 3: y7  y6  y5  y4  y3  y2  y1  y0 */
+        if (fingers) {
+                input_report_abs(dev, ABS_X,
+                        ((packet[1] & 0x0c) << 6) | packet[2]);
+                input_report_abs(dev, ABS_Y, ETP_YMAX_V1 -
+                        (((packet[1] & 0x03) << 8) | packet[3]));
+        }
+
+        input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);
+        input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2);
+        input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);
+        input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
+        input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
+
+        if ((etd->fw_version_maj == 0x01) &&
+            (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
+                /* rocker up */
+                input_report_key(dev, BTN_FORWARD, packet[0] & 0x40);
+                /* rocker down */
+                input_report_key(dev, BTN_BACK, packet[0] & 0x80);
+        }
+
+        input_sync(dev);
+}
+
+/*
+ * Interpret complete data packets and report absolute mode input events for
+ * hardware version 2. (6 byte packets)
+ */
+static void elantech_report_absolute_v2(struct psmouse *psmouse)
+{
+        struct input_dev *dev = psmouse->dev;
+        unsigned char *packet = psmouse->packet;
+        int fingers, x1, y1, x2, y2;
+
+        /* byte 0: n1  n0   .   .   .   .   R   L */
+        fingers = (packet[0] & 0xc0) >> 6;
+        input_report_key(dev, BTN_TOUCH, fingers != 0);
+
+        switch (fingers) {
+        case 1:
+                /* byte 1: x15 x14 x13 x12 x11 x10 x9  x8
+                   byte 2: x7  x6  x5  x4  x4  x2  x1  x0 */
+                input_report_abs(dev, ABS_X, (packet[1] << 8) | packet[2]);
+                /* byte 4: y15 y14 y13 y12 y11 y10 y8  y8
+                   byte 5: y7  y6  y5  y4  y3  y2  y1  y0 */
+                input_report_abs(dev, ABS_Y, ETP_YMAX_V2 -
+                        ((packet[4] << 8) | packet[5]));
+                break;
+
+        case 2:
+                /* The coordinate of each finger is reported separately with
+                   a lower resolution for two finger touches */
+                /* byte 0:  .   .  ay8 ax8  .   .   .   .
+                   byte 1: ax7 ax6 ax5 ax4 ax3 ax2 ax1 ax0 */
+                x1 = ((packet[0] & 0x10) << 4) | packet[1];
+                /* byte 2: ay7 ay6 ay5 ay4 ay3 ay2 ay1 ay0 */
+                y1 = ETP_2FT_YMAX - (((packet[0] & 0x20) << 3) | packet[2]);
+                /* byte 3:  .   .  by8 bx8  .   .   .   .
+                   byte 4: bx7 bx6 bx5 bx4 bx3 bx2 bx1 bx0 */
+                x2 = ((packet[3] & 0x10) << 4) | packet[4];
+                /* byte 5: by7 by8 by5 by4 by3 by2 by1 by0 */
+                y2 = ETP_2FT_YMAX - (((packet[3] & 0x20) << 3) | packet[5]);
+                /* For compatibility with the X Synaptics driver scale up one
+                   coordinate and report as ordinary mouse movent */
+                input_report_abs(dev, ABS_X, x1 << 2);
+                input_report_abs(dev, ABS_Y, y1 << 2);
+                /* For compatibility with the proprietary X Elantech driver
+                   report both coordinates as hat coordinates */
+                input_report_abs(dev, ABS_HAT0X, x1);
+                input_report_abs(dev, ABS_HAT0Y, y1);
+                input_report_abs(dev, ABS_HAT1X, x2);
+                input_report_abs(dev, ABS_HAT1Y, y2);
+                break;
+        }
+
+        input_report_key(dev, BTN_TOOL_FINGER, fingers == 1);
+        input_report_key(dev, BTN_TOOL_DOUBLETAP, fingers == 2);
+        input_report_key(dev, BTN_TOOL_TRIPLETAP, fingers == 3);
+        input_report_key(dev, BTN_LEFT, packet[0] & 0x01);
+        input_report_key(dev, BTN_RIGHT, packet[0] & 0x02);
+
+        input_sync(dev);
+}
+
+static int elantech_check_parity_v1(struct psmouse *psmouse)
+{
+        struct elantech_data *etd = psmouse->private;
+        unsigned char *packet = psmouse->packet;
+        unsigned char p1, p2, p3;
+
+        /* Parity bits are placed differently */
+        if (etd->fw_version_maj == 0x01) {
+                /* byte 0:  D   U  p1  p2   1  p3   R   L */
+                p1 = (packet[0] & 0x20) >> 5;
+                p2 = (packet[0] & 0x10) >> 4;
+        } else {
+                /* byte 0: n1  n0  p2  p1   1  p3   R   L */
+                p1 = (packet[0] & 0x10) >> 4;
+                p2 = (packet[0] & 0x20) >> 5;
+        }
+
+        p3 = (packet[0] & 0x04) >> 2;
+
+        return etd->parity[packet[1]] == p1 &&
+               etd->parity[packet[2]] == p2 &&
+               etd->parity[packet[3]] == p3;
+}
+
+/*
+ * Process byte stream from mouse and handle complete packets
+ */
+static psmouse_ret_t elantech_process_byte(struct psmouse *psmouse)
+{
+        struct elantech_data *etd = psmouse->private;
+
+        if (psmouse->pktcnt < psmouse->pktsize)
+                return PSMOUSE_GOOD_DATA;
+
+        if (etd->debug > 1)
+                elantech_packet_dump(psmouse->packet, psmouse->pktsize);
+
+        switch (etd->hw_version) {
+        case 1:
+                if (etd->paritycheck && !elantech_check_parity_v1(psmouse))
+                        return PSMOUSE_BAD_DATA;
+
+                elantech_report_absolute_v1(psmouse);
+                break;
+
+        case 2:
+                /* We don't know how to check parity in protocol v2 */
+                elantech_report_absolute_v2(psmouse);
+                break;
+        }
+
+        return PSMOUSE_FULL_PACKET;
+}
+
+/*
+ * Put the touchpad into absolute mode
+ */
+static int elantech_set_absolute_mode(struct psmouse *psmouse)
+{
+        struct elantech_data *etd = psmouse->private;
+        unsigned char val;
+        int tries = ETP_READ_BACK_TRIES;
+        int rc = 0;
+
+        switch (etd->hw_version) {
+        case 1:
+                etd->reg_10 = 0x16;
+                etd->reg_11 = 0x8f;
+                if (elantech_write_reg(psmouse, 0x10, etd->reg_10) ||
+                    elantech_write_reg(psmouse, 0x11, etd->reg_11)) {
+                        rc = -1;
+                }
+                break;
+
+        case 2:
+                                        /* Windows driver values */
+                etd->reg_10 = 0x54;
+                etd->reg_11 = 0x88;     /* 0x8a */
+                etd->reg_21 = 0x60;     /* 0x00 */
+                if (elantech_write_reg(psmouse, 0x10, etd->reg_10) ||
+                    elantech_write_reg(psmouse, 0x11, etd->reg_11) ||
+                    elantech_write_reg(psmouse, 0x21, etd->reg_21)) {
+                        rc = -1;
+                        break;
+                }
+                /*
+                 * Read back reg 0x10. The touchpad is probably initalising
+                 * and not ready until we read back the value we just wrote.
+                 */
+                do {
+                        rc = elantech_read_reg(psmouse, 0x10, &val);
+                        if (rc == 0)
+                                break;
+                        tries--;
+                        elantech_debug("elantech.c: retrying read (%d).\n",
+                                tries);
+                        msleep(ETP_READ_BACK_DELAY);
+                } while (tries > 0);
+                if (rc)
+                        pr_err("elantech.c: failed to read back register 0x10.\n");
+                break;
+        }
+
+        if (rc)
+                pr_err("elantech.c: failed to initialise registers.\n");
+
+        return rc;
+}
+
+/*
+ * Set the appropriate event bits for the input subsystem
+ */
+static void elantech_set_input_params(struct psmouse *psmouse)
+{
+        struct input_dev *dev = psmouse->dev;
+        struct elantech_data *etd = psmouse->private;
+
+        __set_bit(EV_KEY, dev->evbit);
+        __set_bit(EV_ABS, dev->evbit);
+
+        __set_bit(BTN_LEFT, dev->keybit);
+        __set_bit(BTN_RIGHT, dev->keybit);
+
+        __set_bit(BTN_TOUCH, dev->keybit);
+        __set_bit(BTN_TOOL_FINGER, dev->keybit);
+        __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit);
+        __set_bit(BTN_TOOL_TRIPLETAP, dev->keybit);
+
+        switch (etd->hw_version) {
+        case 1:
+                /* Rocker button */
+                if ((etd->fw_version_maj == 0x01) &&
+                    (etd->capabilities & ETP_CAP_HAS_ROCKER)) {
+                        __set_bit(BTN_FORWARD, dev->keybit);
+                        __set_bit(BTN_BACK, dev->keybit);
+                }
+                input_set_abs_params(dev, ABS_X, ETP_XMIN_V1, ETP_XMAX_V1, 0, 0);
+                input_set_abs_params(dev, ABS_Y, ETP_YMIN_V1, ETP_YMAX_V1, 0, 0);
+                break;
+
+        case 2:
+                input_set_abs_params(dev, ABS_X, ETP_XMIN_V2, ETP_XMAX_V2, 0, 0);
+                input_set_abs_params(dev, ABS_Y, ETP_YMIN_V2, ETP_YMAX_V2, 0, 0);
+                input_set_abs_params(dev, ABS_HAT0X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
+                input_set_abs_params(dev, ABS_HAT0Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
+                input_set_abs_params(dev, ABS_HAT1X, ETP_2FT_XMIN, ETP_2FT_XMAX, 0, 0);
+                input_set_abs_params(dev, ABS_HAT1Y, ETP_2FT_YMIN, ETP_2FT_YMAX, 0, 0);
+                break;
+        }
+}
+
+struct elantech_attr_data {
+        size_t          field_offset;
+        unsigned char   reg;
+};
+
+/*
+ * Display a register value by reading a sysfs entry
+ */
+static ssize_t elantech_show_int_attr(struct psmouse *psmouse, void *data,
+                                        char *buf)
+{
+        struct elantech_data *etd = psmouse->private;
+        struct elantech_attr_data *attr = data;
+        unsigned char *reg = (unsigned char *) etd + attr->field_offset;
+        int rc = 0;
+
+        if (attr->reg)
+                rc = elantech_read_reg(psmouse, attr->reg, reg);
+
+        return sprintf(buf, "0x%02x\n", (attr->reg && rc) ? -1 : *reg);
+}
+
+/*
+ * Write a register value by writing a sysfs entry
+ */
+static ssize_t elantech_set_int_attr(struct psmouse *psmouse,
+                                     void *data, const char *buf, size_t count)
+{
+        struct elantech_data *etd = psmouse->private;
+        struct elantech_attr_data *attr = data;
+        unsigned char *reg = (unsigned char *) etd + attr->field_offset;
+        unsigned long value;
+        int err;
+
+        err = strict_strtoul(buf, 16, &value);
+        if (err)
+                return err;
+
+        if (value > 0xff)
+                return -EINVAL;
+
+        /* Do we need to preserve some bits for version 2 hardware too? */
+        if (etd->hw_version == 1) {
+                if (attr->reg == 0x10)
+                        /* Force absolute mode always on */
+                        value |= ETP_R10_ABSOLUTE_MODE;
+                else if (attr->reg == 0x11)
+                        /* Force 4 byte mode always on */
+                        value |= ETP_R11_4_BYTE_MODE;
+        }
+
+        if (!attr->reg || elantech_write_reg(psmouse, attr->reg, value) == 0)
+                *reg = value;
+
+        return count;
+}
+
+#define ELANTECH_INT_ATTR(_name, _register)                             \
+        static struct elantech_attr_data elantech_attr_##_name = {      \
+                .field_offset = offsetof(struct elantech_data, _name),  \
+                .reg = _register,                                       \
+        };                                                              \
+        PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO,                   \
+                            &elantech_attr_##_name,                     \
+                            elantech_show_int_attr,                     \
+                            elantech_set_int_attr)
+
+ELANTECH_INT_ATTR(reg_10, 0x10);
+ELANTECH_INT_ATTR(reg_11, 0x11);
+ELANTECH_INT_ATTR(reg_20, 0x20);
+ELANTECH_INT_ATTR(reg_21, 0x21);
+ELANTECH_INT_ATTR(reg_22, 0x22);
+ELANTECH_INT_ATTR(reg_23, 0x23);
+ELANTECH_INT_ATTR(reg_24, 0x24);
+ELANTECH_INT_ATTR(reg_25, 0x25);
+ELANTECH_INT_ATTR(reg_26, 0x26);
+ELANTECH_INT_ATTR(debug, 0);
+ELANTECH_INT_ATTR(paritycheck, 0);
+
+static struct attribute *elantech_attrs[] = {
+        &psmouse_attr_reg_10.dattr.attr,
+        &psmouse_attr_reg_11.dattr.attr,
+        &psmouse_attr_reg_20.dattr.attr,
+        &psmouse_attr_reg_21.dattr.attr,
+        &psmouse_attr_reg_22.dattr.attr,
+        &psmouse_attr_reg_23.dattr.attr,
+        &psmouse_attr_reg_24.dattr.attr,
+        &psmouse_attr_reg_25.dattr.attr,
+        &psmouse_attr_reg_26.dattr.attr,
+        &psmouse_attr_debug.dattr.attr,
+        &psmouse_attr_paritycheck.dattr.attr,
+        NULL
+};
+
+static struct attribute_group elantech_attr_group = {
+        .attrs = elantech_attrs,
+};
+
+/*
+ * Use magic knock to detect Elantech touchpad
+ */
+int elantech_detect(struct psmouse *psmouse, int set_properties)
+{
+        struct ps2dev *ps2dev = &psmouse->ps2dev;
+        unsigned char param[3];
+
+        ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
+
+        if (ps2_command(ps2dev,  NULL, PSMOUSE_CMD_DISABLE) ||
+            ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||
+            ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||
+            ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||
+            ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {
+                pr_err("elantech.c: sending Elantech magic knock failed.\n");
+                return -1;
+        }
+
+        /*
+         * Report this in case there are Elantech models that use a different
+         * set of magic numbers
+         */
+        if (param[0] != 0x3c || param[1] != 0x03 || param[2] != 0xc8) {
+                pr_info("elantech.c: unexpected magic knock result 0x%02x, 0x%02x, 0x%02x.\n",
+                        param[0], param[1], param[2]);
+                return -1;
+        }
+
+        if (set_properties) {
+                psmouse->vendor = "Elantech";
+                psmouse->name = "Touchpad";
+        }
+
+        return 0;
+}
+
+/*
+ * Clean up sysfs entries when disconnecting
+ */
+static void elantech_disconnect(struct psmouse *psmouse)
+{
+        sysfs_remove_group(&psmouse->ps2dev.serio->dev.kobj,
+                           &elantech_attr_group);
+        kfree(psmouse->private);
+        psmouse->private = NULL;
+}
+
+/*
+ * Put the touchpad back into absolute mode when reconnecting
+ */
+static int elantech_reconnect(struct psmouse *psmouse)
+{
+        if (elantech_detect(psmouse, 0))
+                return -1;
+
+        if (elantech_set_absolute_mode(psmouse)) {
+                pr_err("elantech.c: failed to put touchpad back into absolute mode.\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * Initialize the touchpad and create sysfs entries
+ */
+int elantech_init(struct psmouse *psmouse)
+{
+        struct elantech_data *etd;
+        int i, error;
+        unsigned char param[3];
+
+        etd = kzalloc(sizeof(struct elantech_data), GFP_KERNEL);
+        psmouse->private = etd;
+        if (!etd)
+                return -1;
+
+        etd->parity[0] = 1;
+        for (i = 1; i < 256; i++)
+                etd->parity[i] = etd->parity[i & (i - 1)] ^ 1;
+
+        /*
+         * Find out what version hardware this is
+         */
+        if (synaptics_send_cmd(psmouse, ETP_FW_VERSION_QUERY, param)) {
+                pr_err("elantech.c: failed to query firmware version.\n");
+                goto init_fail;
+        }
+        pr_info("elantech.c: Elantech version query result 0x%02x, 0x%02x, 0x%02x.\n",
+                param[0], param[1], param[2]);
+        etd->fw_version_maj = param[0];
+        etd->fw_version_min = param[2];
+
+        /*
+         * Assume every version greater than this is new EeePC style
+         * hardware with 6 byte packets
+         */
+        if (etd->fw_version_maj >= 0x02 && etd->fw_version_min >= 0x30) {
+                etd->hw_version = 2;
+                /* For now show extra debug information */
+                etd->debug = 1;
+                /* Don't know how to do parity checking for version 2 */
+                etd->paritycheck = 0;
+        } else {
+                etd->hw_version = 1;
+                etd->paritycheck = 1;
+        }
+        pr_info("elantech.c: assuming hardware version %d, firmware version %d.%d\n",
+                etd->hw_version, etd->fw_version_maj, etd->fw_version_min);
+
+        if (synaptics_send_cmd(psmouse, ETP_CAPABILITIES_QUERY, param)) {
+                pr_err("elantech.c: failed to query capabilities.\n");
+                goto init_fail;
+        }
+        pr_info("elantech.c: Synaptics capabilities query result 0x%02x, 0x%02x, 0x%02x.\n",
+                param[0], param[1], param[2]);
+        etd->capabilities = param[0];
+
+        if (elantech_set_absolute_mode(psmouse)) {
+                pr_err("elantech.c: failed to put touchpad into absolute mode.\n");
+                goto init_fail;
+        }
+
+        elantech_set_input_params(psmouse);
+
+        error = sysfs_create_group(&psmouse->ps2dev.serio->dev.kobj,
+                                   &elantech_attr_group);
+        if (error) {
+                pr_err("elantech.c: failed to create sysfs attributes, error: %d.\n",
+                        error);
+                goto init_fail;
+        }
+
+        psmouse->protocol_handler = elantech_process_byte;
+        psmouse->disconnect = elantech_disconnect;
+        psmouse->reconnect = elantech_reconnect;
+        psmouse->pktsize = etd->hw_version == 2 ? 6 : 4;
+
+        return 0;
+
+ init_fail:
+        kfree(etd);
+        return -1;
+}
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
new file mode 100644
index 000000000000..bee282b540bc
--- /dev/null
+++ b/drivers/input/mouse/elantech.h
@@ -0,0 +1,124 @@
+/*
+ * Elantech Touchpad driver (v5)
+ *
+ * Copyright (C) 2007-2008 Arjan Opmeer <arjan@opmeer.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Trademarks are the property of their respective owners.
+ */
+
+#ifndef _ELANTECH_H
+#define _ELANTECH_H
+
+/*
+ * Command values for Synaptics style queries
+ */
+#define ETP_FW_VERSION_QUERY            0x01
+#define ETP_CAPABILITIES_QUERY          0x02
+
+/*
+ * Command values for register reading or writing
+ */
+#define ETP_REGISTER_READ               0x10
+#define ETP_REGISTER_WRITE              0x11
+
+/*
+ * Hardware version 2 custom PS/2 command value
+ */
+#define ETP_PS2_CUSTOM_COMMAND          0xf8
+
+/*
+ * Times to retry a ps2_command and millisecond delay between tries
+ */
+#define ETP_PS2_COMMAND_TRIES           3
+#define ETP_PS2_COMMAND_DELAY           500
+
+/*
+ * Times to try to read back a register and millisecond delay between tries
+ */
+#define ETP_READ_BACK_TRIES             5
+#define ETP_READ_BACK_DELAY             2000
+
+/*
+ * Register bitmasks for hardware version 1
+ */
+#define ETP_R10_ABSOLUTE_MODE           0x04
+#define ETP_R11_4_BYTE_MODE             0x02
+
+/*
+ * Capability bitmasks
+ */
+#define ETP_CAP_HAS_ROCKER              0x04
+
+/*
+ * One hard to find application note states that X axis range is 0 to 576
+ * and Y axis range is 0 to 384 for harware version 1.
+ * Edge fuzz might be necessary because of bezel around the touchpad
+ */
+#define ETP_EDGE_FUZZ_V1                32
+
+#define ETP_XMIN_V1                     (  0 + ETP_EDGE_FUZZ_V1)
+#define ETP_XMAX_V1                     (576 - ETP_EDGE_FUZZ_V1)
+#define ETP_YMIN_V1                     (  0 + ETP_EDGE_FUZZ_V1)
+#define ETP_YMAX_V1                     (384 - ETP_EDGE_FUZZ_V1)
+
+/*
+ * It seems the resolution for hardware version 2 doubled.
+ * Hence the X and Y ranges are doubled too.
+ * The bezel around the pad also appears to be smaller
+ */
+#define ETP_EDGE_FUZZ_V2                8
+
+#define ETP_XMIN_V2                     (   0 + ETP_EDGE_FUZZ_V2)
+#define ETP_XMAX_V2                     (1152 - ETP_EDGE_FUZZ_V2)
+#define ETP_YMIN_V2                     (   0 + ETP_EDGE_FUZZ_V2)
+#define ETP_YMAX_V2                     ( 768 - ETP_EDGE_FUZZ_V2)
+
+/*
+ * For two finger touches the coordinate of each finger gets reported
+ * separately but with reduced resolution.
+ */
+#define ETP_2FT_FUZZ                    4
+
+#define ETP_2FT_XMIN                    (  0 + ETP_2FT_FUZZ)
+#define ETP_2FT_XMAX                    (288 - ETP_2FT_FUZZ)
+#define ETP_2FT_YMIN                    (  0 + ETP_2FT_FUZZ)
+#define ETP_2FT_YMAX                    (192 - ETP_2FT_FUZZ)
+
+struct elantech_data {
+        unsigned char reg_10;
+        unsigned char reg_11;
+        unsigned char reg_20;
+        unsigned char reg_21;
+        unsigned char reg_22;
+        unsigned char reg_23;
+        unsigned char reg_24;
+        unsigned char reg_25;
+        unsigned char reg_26;
+        unsigned char debug;
+        unsigned char capabilities;
+        unsigned char fw_version_maj;
+        unsigned char fw_version_min;
+        unsigned char hw_version;
+        unsigned char paritycheck;
+        unsigned char parity[256];
+};
+
+#ifdef CONFIG_MOUSE_PS2_ELANTECH
+int elantech_detect(struct psmouse *psmouse, int set_properties);
+int elantech_init(struct psmouse *psmouse);
+#else
+static inline int elantech_detect(struct psmouse *psmouse, int set_properties)
+{
+        return -ENOSYS;
+}
+static inline int elantech_init(struct psmouse *psmouse)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_MOUSE_PS2_ELANTECH */
+
+#endif
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 126e977e199e..f8f86de694bb 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -29,6 +29,7 @@
 #include "lifebook.h"
 #include "trackpoint.h"
 #include "touchkit_ps2.h"
+#include "elantech.h"
 
 #define DRIVER_DESC     "PS/2 mouse driver"
 
@@ -650,6 +651,19 @@ static int psmouse_extensions(struct psmouse *psmouse,
                 max_proto = PSMOUSE_IMEX;
         }
 
+/*
+ * Try Elantech touchpad.
+ */
+        if (max_proto > PSMOUSE_IMEX &&
+                        elantech_detect(psmouse, set_properties) == 0) {
+                if (!set_properties || elantech_init(psmouse) == 0)
+                        return PSMOUSE_ELANTECH;
+/*
+ * Init failed, try basic relative protocols
+ */
+                max_proto = PSMOUSE_IMEX;
+        }
+
         if (max_proto > PSMOUSE_IMEX) {
                 if (genius_detect(psmouse, set_properties) == 0)
                         return PSMOUSE_GENPS;
@@ -789,6 +803,15 @@ static const struct psmouse_protocol psmouse_protocols[] = {
                 .detect         = hgpk_detect,
         },
 #endif
+#ifdef CONFIG_MOUSE_PS2_ELANTECH
+        {
+                .type           = PSMOUSE_ELANTECH,
+                .name           = "ETPS/2",
+                .alias          = "elantech",
+                .detect         = elantech_detect,
+                .init           = elantech_init,
+        },
+ #endif
         {
                 .type           = PSMOUSE_CORTRON,
                 .name           = "CortronPS/2",
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 8b608a1cdd12..54ed267894bd 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -90,6 +90,7 @@ enum psmouse_type {
         PSMOUSE_TOUCHKIT_PS2,
         PSMOUSE_CORTRON,
         PSMOUSE_HGPK,
+        PSMOUSE_ELANTECH,
         PSMOUSE_AUTO            /* This one should always be last */
 };
 
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 8137e50ded87..d8c056fe7e98 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -519,7 +519,6 @@ static int mousedev_release(struct inode *inode, struct file *file)
         struct mousedev_client *client = file->private_data;
         struct mousedev *mousedev = client->mousedev;
 
-        mousedev_fasync(-1, file, 0);
         mousedev_detach_client(mousedev, client);
         kfree(client);
 
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index a321aea2c7b5..eec375cd10e6 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -135,6 +135,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "5a"),
                 },
         },
+        {
+                .ident = "Blue FB5601",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "blue"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "M606"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 470770c09260..06bbd0e74c6f 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -135,7 +135,6 @@ static int serio_raw_release(struct inode *inode, struct file *file)
 
         mutex_lock(&serio_raw_mutex);
 
-        serio_raw_fasync(-1, file, 0);
         serio_raw_cleanup(serio_raw);
 
         mutex_unlock(&serio_raw_mutex);
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index f1fddb18d70d..1f3cc512eff8 100644
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/workqueue.h>
 #include <linux/mfd/da903x.h>
 
 #define DA9030_LED1_CONTROL     0x20
@@ -57,7 +58,7 @@ static void da903x_led_work(struct work_struct *work)
                 offset = DA9030_LED_OFFSET(led->id);
                 val = led->flags & ~0x87;
                 val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */
-                val |= (led->new_brightness >> 5) & 0x7; /* PWM<2:0> */
+                val |= (0x7 - (led->new_brightness >> 5)) & 0x7; /* PWM<2:0> */
                 da903x_write(led->master, DA9030_LED1_CONTROL + offset, val);
                 break;
         case DA9030_ID_VIBRA:
diff --git a/drivers/leds/leds-hp-disk.c b/drivers/leds/leds-hp-disk.c
index 53a25b1c2dae..44fa757d8254 100644
--- a/drivers/leds/leds-hp-disk.c
+++ b/drivers/leds/leds-hp-disk.c
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/kthread.h>
-#include <linux/version.h>
 #include <linux/leds.h>
 #include <acpi/acpi_drivers.h>
 
@@ -49,7 +48,7 @@ static struct acpi_hpled adev;
 
 static acpi_status hpled_acpi_write(acpi_handle handle, int reg)
 {
-        unsigned long ret; /* Not used when writing */
+        unsigned long long ret; /* Not used when writing */
         union acpi_object in_obj[1];
         struct acpi_object_list args = { 1, in_obj };
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 92dcc06832a4..9d7b53ed75b2 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -656,9 +656,10 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
                 return;
 
         if (!ms->log_failure) {
-                while ((bio = bio_list_pop(failures)))
+                while ((bio = bio_list_pop(failures))) {
                         ms->in_sync = 0;
                         dm_rh_mark_nosync(ms->rh, bio, bio->bi_size, 0);
+                }
                 return;
         }
 
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index b2d9d1ac28ad..6c96db26b87c 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -229,19 +229,21 @@ static void __insert_origin(struct origin *o)
  */
 static int register_snapshot(struct dm_snapshot *snap)
 {
-        struct origin *o;
+        struct origin *o, *new_o;
         struct block_device *bdev = snap->origin->bdev;
 
+        new_o = kmalloc(sizeof(*new_o), GFP_KERNEL);
+        if (!new_o)
+                return -ENOMEM;
+
         down_write(&_origins_lock);
         o = __lookup_origin(bdev);
 
-        if (!o) {
+        if (o)
+                kfree(new_o);
+        else {
                 /* New origin */
-                o = kmalloc(sizeof(*o), GFP_KERNEL);
-                if (!o) {
-                        up_write(&_origins_lock);
-                        return -ENOMEM;
-                }
+                o = new_o;
 
                 /* Initialise the struct */
                 INIT_LIST_HEAD(&o->snapshots);
@@ -368,6 +370,7 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
         struct dm_snap_pending_exception *pe = mempool_alloc(s->pending_pool,
                                                              GFP_NOIO);
 
+        atomic_inc(&s->pending_exceptions_count);
         pe->snap = s;
 
         return pe;
@@ -375,7 +378,11 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
 
 static void free_pending_exception(struct dm_snap_pending_exception *pe)
 {
-        mempool_free(pe, pe->snap->pending_pool);
+        struct dm_snapshot *s = pe->snap;
+
+        mempool_free(pe, s->pending_pool);
+        smp_mb__before_atomic_dec();
+        atomic_dec(&s->pending_exceptions_count);
 }
 
 static void insert_completed_exception(struct dm_snapshot *s,
@@ -600,6 +607,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         s->valid = 1;
         s->active = 0;
+        atomic_set(&s->pending_exceptions_count, 0);
         init_rwsem(&s->lock);
         spin_lock_init(&s->pe_lock);
         s->ti = ti;
@@ -726,6 +734,14 @@ static void snapshot_dtr(struct dm_target *ti)
         /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
 
+        while (atomic_read(&s->pending_exceptions_count))
+                yield();
+        /*
+         * Ensure instructions in mempool_destroy aren't reordered
+         * before atomic_read.
+         */
+        smp_mb();
+
 #ifdef CONFIG_DM_DEBUG
         for (i = 0; i < DM_TRACKED_CHUNK_HASH_SIZE; i++)
                 BUG_ON(!hlist_empty(&s->tracked_chunk_hash[i]));
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index f07315fe2362..99c0106ede2d 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -160,6 +160,8 @@ struct dm_snapshot {
 
         mempool_t *pending_pool;
 
+        atomic_t pending_exceptions_count;
+
         struct exception_table pending;
         struct exception_table complete;
 
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 190147c79e79..3b90c5c924ec 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -148,6 +148,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
 
         min_sectors = conf->array_sectors;
         sector_div(min_sectors, PAGE_SIZE/sizeof(struct dev_info *));
+        if (min_sectors == 0)
+                min_sectors = 1;
 
         /* min_sectors is the minimum spacing that will fit the hash
          * table in one PAGE.  This may be much smaller than needed.
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c1a837ca193c..1b1d32694f6f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -222,6 +222,9 @@ static void mddev_put(mddev_t *mddev)
                 list_del(&mddev->all_mddevs);
                 spin_unlock(&all_mddevs_lock);
                 blk_cleanup_queue(mddev->queue);
+                if (mddev->sysfs_state)
+                        sysfs_put(mddev->sysfs_state);
+                mddev->sysfs_state = NULL;
                 kobject_put(&mddev->kobj);
         } else
                 spin_unlock(&all_mddevs_lock);
@@ -1459,6 +1462,8 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 kobject_del(&rdev->kobj);
                 goto fail;
         }
+        rdev->sysfs_state = sysfs_get_dirent(rdev->kobj.sd, "state");
+
         list_add_rcu(&rdev->same_set, &mddev->disks);
         bd_claim_by_disk(rdev->bdev, rdev->bdev->bd_holder, mddev->gendisk);
         return 0;
@@ -1488,7 +1493,8 @@ static void unbind_rdev_from_array(mdk_rdev_t * rdev)
         printk(KERN_INFO "md: unbind<%s>\n", bdevname(rdev->bdev,b));
         rdev->mddev = NULL;
         sysfs_remove_link(&rdev->kobj, "block");
-
+        sysfs_put(rdev->sysfs_state);
+        rdev->sysfs_state = NULL;
         /* We need to delay this, otherwise we can deadlock when
          * writing to 'remove' to "dev/state".  We also need
          * to delay it due to rcu usage.
@@ -1923,8 +1929,8 @@ state_store(mdk_rdev_t *rdev, const char *buf, size_t len)
 
                 err = 0;
         }
-        if (!err)
-                sysfs_notify(&rdev->kobj, NULL, "state");
+        if (!err && rdev->sysfs_state)
+                sysfs_notify_dirent(rdev->sysfs_state);
         return err ? err : len;
 }
 static struct rdev_sysfs_entry rdev_state =
@@ -2019,7 +2025,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                         rdev->raid_disk = -1;
                         return err;
                 } else
-                        sysfs_notify(&rdev->kobj, NULL, "state");
+                        sysfs_notify_dirent(rdev->sysfs_state);
                 sprintf(nm, "rd%d", rdev->raid_disk);
                 if (sysfs_create_link(&rdev->mddev->kobj, &rdev->kobj, nm))
                         printk(KERN_WARNING
@@ -2036,7 +2042,7 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len)
                 clear_bit(Faulty, &rdev->flags);
                 clear_bit(WriteMostly, &rdev->flags);
                 set_bit(In_sync, &rdev->flags);
-                sysfs_notify(&rdev->kobj, NULL, "state");
+                sysfs_notify_dirent(rdev->sysfs_state);
         }
         return len;
 }
@@ -2770,7 +2776,7 @@ array_state_store(mddev_t *mddev, const char *buf, size_t len)
         if (err)
                 return err;
         else {
-                sysfs_notify(&mddev->kobj, NULL, "array_state");
+                sysfs_notify_dirent(mddev->sysfs_state);
                 return len;
         }
 }
@@ -3457,6 +3463,11 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         disk->fops = &md_fops;
         disk->private_data = mddev;
         disk->queue = mddev->queue;
+        /* Allow extended partitions.  This makes the
+         * 'mdp' device redundant, but we can really
+         * remove it now.
+         */
+        disk->flags |= GENHD_FL_EXT_DEVT;
         add_disk(disk);
         mddev->gendisk = disk;
         error = kobject_init_and_add(&mddev->kobj, &md_ktype,
@@ -3465,8 +3476,10 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data)
         if (error)
                 printk(KERN_WARNING "md: cannot register %s/md - name in use\n",
                        disk->disk_name);
-        else
+        else {
                 kobject_uevent(&mddev->kobj, KOBJ_ADD);
+                mddev->sysfs_state = sysfs_get_dirent(mddev->kobj.sd, "array_state");
+        }
         return NULL;
 }
 
@@ -3477,7 +3490,7 @@ static void md_safemode_timeout(unsigned long data)
         if (!atomic_read(&mddev->writes_pending)) {
                 mddev->safemode = 1;
                 if (mddev->external)
-                        set_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags);
+                        sysfs_notify_dirent(mddev->sysfs_state);
         }
         md_wakeup_thread(mddev->thread);
 }
@@ -3578,7 +3591,7 @@ static int do_md_run(mddev_t * mddev)
                                 return -EINVAL;
                         }
                 }
-                sysfs_notify(&rdev->kobj, NULL, "state");
+                sysfs_notify_dirent(rdev->sysfs_state);
         }
 
         md_probe(mddev->unit, NULL, NULL);
@@ -3740,7 +3753,7 @@ static int do_md_run(mddev_t * mddev)
 
         mddev->changed = 1;
         md_new_event(mddev);
-        sysfs_notify(&mddev->kobj, NULL, "array_state");
+        sysfs_notify_dirent(mddev->sysfs_state);
         sysfs_notify(&mddev->kobj, NULL, "sync_action");
         sysfs_notify(&mddev->kobj, NULL, "degraded");
         kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
@@ -3767,7 +3780,7 @@ static int restart_array(mddev_t *mddev)
         set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
         md_wakeup_thread(mddev->thread);
         md_wakeup_thread(mddev->sync_thread);
-        sysfs_notify(&mddev->kobj, NULL, "array_state");
+        sysfs_notify_dirent(mddev->sysfs_state);
         return 0;
 }
 
@@ -3847,7 +3860,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                         module_put(mddev->pers->owner);
                         mddev->pers = NULL;
                         /* tell userspace to handle 'inactive' */
-                        sysfs_notify(&mddev->kobj, NULL, "array_state");
+                        sysfs_notify_dirent(mddev->sysfs_state);
 
                         set_capacity(disk, 0);
                         mddev->changed = 1;
@@ -3927,13 +3940,14 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                 mddev->degraded = 0;
                 mddev->barriers_work = 0;
                 mddev->safemode = 0;
+                kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
 
         } else if (mddev->pers)
                 printk(KERN_INFO "md: %s switched to read-only mode.\n",
                         mdname(mddev));
         err = 0;
         md_new_event(mddev);
-        sysfs_notify(&mddev->kobj, NULL, "array_state");
+        sysfs_notify_dirent(mddev->sysfs_state);
 out:
         return err;
 }
@@ -4297,7 +4311,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                 if (err)
                         export_rdev(rdev);
                 else
-                        sysfs_notify(&rdev->kobj, NULL, "state");
+                        sysfs_notify_dirent(rdev->sysfs_state);
 
                 md_update_sb(mddev, 1);
                 if (mddev->degraded)
@@ -4938,7 +4952,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,
         if (_IOC_TYPE(cmd) == MD_MAJOR && mddev->ro && mddev->pers) {
                 if (mddev->ro == 2) {
                         mddev->ro = 0;
-                        sysfs_notify(&mddev->kobj, NULL, "array_state");
+                        sysfs_notify_dirent(mddev->sysfs_state);
                         set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
                         md_wakeup_thread(mddev->thread);
                 } else {
@@ -5612,7 +5626,7 @@ void md_write_start(mddev_t *mddev, struct bio *bi)
                 spin_unlock_irq(&mddev->write_lock);
         }
         if (did_change)
-                sysfs_notify(&mddev->kobj, NULL, "array_state");
+                sysfs_notify_dirent(mddev->sysfs_state);
         wait_event(mddev->sb_wait,
                    !test_bit(MD_CHANGE_CLEAN, &mddev->flags) &&
                    !test_bit(MD_CHANGE_PENDING, &mddev->flags));
@@ -5655,7 +5669,7 @@ int md_allow_write(mddev_t *mddev)
                         mddev->safemode = 1;
                 spin_unlock_irq(&mddev->write_lock);
                 md_update_sb(mddev, 0);
-                sysfs_notify(&mddev->kobj, NULL, "array_state");
+                sysfs_notify_dirent(mddev->sysfs_state);
         } else
                 spin_unlock_irq(&mddev->write_lock);
 
@@ -6048,9 +6062,6 @@ void md_check_recovery(mddev_t *mddev)
         if (mddev->bitmap)
                 bitmap_daemon_work(mddev->bitmap);
 
-        if (test_and_clear_bit(MD_NOTIFY_ARRAY_STATE, &mddev->flags))
-                sysfs_notify(&mddev->kobj, NULL, "array_state");
-
         if (mddev->ro)
                 return;
 
@@ -6103,7 +6114,7 @@ void md_check_recovery(mddev_t *mddev)
                                 mddev->safemode = 0;
                         spin_unlock_irq(&mddev->write_lock);
                         if (did_change)
-                                sysfs_notify(&mddev->kobj, NULL, "array_state");
+                                sysfs_notify_dirent(mddev->sysfs_state);
                 }
 
                 if (mddev->flags)
@@ -6111,7 +6122,7 @@ void md_check_recovery(mddev_t *mddev)
 
                 rdev_for_each(rdev, rtmp, mddev)
                         if (test_and_clear_bit(StateChanged, &rdev->flags))
-                                sysfs_notify(&rdev->kobj, NULL, "state");
+                                sysfs_notify_dirent(rdev->sysfs_state);
 
 
                 if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
@@ -6221,7 +6232,7 @@ void md_check_recovery(mddev_t *mddev)
 
 void md_wait_for_blocked_rdev(mdk_rdev_t *rdev, mddev_t *mddev)
 {
-        sysfs_notify(&rdev->kobj, NULL, "state");
+        sysfs_notify_dirent(rdev->sysfs_state);
         wait_event_timeout(rdev->blocked_wait,
                            !test_bit(Blocked, &rdev->flags),
                            msecs_to_jiffies(5000));
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index da5129a24b18..970a96ef9b18 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1137,7 +1137,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
         if (!enough(conf))
                 return -EINVAL;
 
-        if (rdev->raid_disk)
+        if (rdev->raid_disk >= 0)
                 first = last = rdev->raid_disk;
 
         if (rdev->saved_raid_disk >= 0 &&
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 5689d1f1d444..8557bf12cfb4 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -223,6 +223,8 @@ static void dvb_frontend_init(struct dvb_frontend *fe)
         if (fe->ops.init)
                 fe->ops.init(fe);
         if (fe->ops.tuner_ops.init) {
+                if (fe->ops.i2c_gate_ctrl)
+                        fe->ops.i2c_gate_ctrl(fe, 1);
                 fe->ops.tuner_ops.init(fe);
                 if (fe->ops.i2c_gate_ctrl)
                         fe->ops.i2c_gate_ctrl(fe, 0);
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 3c13bcfa6385..62b68c291d99 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -261,7 +261,7 @@ config DVB_USB_DW2102
           Say Y here to support the DvbWorld DVB-S/S2 USB2.0 receivers
           and the TeVii S650.
 
-config  DVB_USB_CINERGY_T2
+config DVB_USB_CINERGY_T2
         tristate "Terratec CinergyT2/qanu USB 2.0 DVB-T receiver"
         depends on DVB_USB
         help
@@ -283,6 +283,7 @@ config DVB_USB_ANYSEE
 config DVB_USB_DTV5100
         tristate "AME DTV-5100 USB2.0 DVB-T support"
         depends on DVB_USB
+        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
         select MEDIA_TUNER_QT1010 if !DVB_FE_CUSTOMISE
         help
           Say Y here to support the AME DTV-5100 USB2.0 DVB-T receiver.
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index cb0829c038ce..847d8fdd9ec4 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -31,13 +31,13 @@
 #include "mc44s80x.h"
 #endif
 
-int dvb_usb_af9015_debug;
+static int dvb_usb_af9015_debug;
 module_param_named(debug, dvb_usb_af9015_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
-int dvb_usb_af9015_remote;
+static int dvb_usb_af9015_remote;
 module_param_named(remote, dvb_usb_af9015_remote, int, 0644);
 MODULE_PARM_DESC(remote, "select remote");
-int dvb_usb_af9015_dual_mode;
+static int dvb_usb_af9015_dual_mode;
 module_param_named(dual_mode, dvb_usb_af9015_dual_mode, int, 0644);
 MODULE_PARM_DESC(dual_mode, "enable dual mode");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
@@ -46,7 +46,7 @@ static DEFINE_MUTEX(af9015_usb_mutex);
 
 static struct af9015_config af9015_config;
 static struct dvb_usb_device_properties af9015_properties[2];
-int af9015_properties_count = ARRAY_SIZE(af9015_properties);
+static int af9015_properties_count = ARRAY_SIZE(af9015_properties);
 
 static struct af9013_config af9015_af9013_config[] = {
         {
@@ -549,7 +549,7 @@ static int af9015_eeprom_dump(struct dvb_usb_device *d)
         return 0;
 }
 
-int af9015_download_ir_table(struct dvb_usb_device *d)
+static int af9015_download_ir_table(struct dvb_usb_device *d)
 {
         int i, packets = 0, ret;
         u16 addr = 0x9a56; /* ir-table start address */
@@ -999,7 +999,7 @@ static int af9015_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 }
 
 /* init 2nd I2C adapter */
-int af9015_i2c_init(struct dvb_usb_device *d)
+static int af9015_i2c_init(struct dvb_usb_device *d)
 {
         int ret;
         struct af9015_state *state = d->priv;
@@ -1419,7 +1419,7 @@ static int af9015_usb_probe(struct usb_interface *intf,
         return ret;
 }
 
-void af9015_i2c_exit(struct dvb_usb_device *d)
+static void af9015_i2c_exit(struct dvb_usb_device *d)
 {
         struct af9015_state *state = d->priv;
         deb_info("%s: \n", __func__);
diff --git a/drivers/media/dvb/dvb-usb/af9015.h b/drivers/media/dvb/dvb-usb/af9015.h
index 882e8a4b3681..6c3c97293316 100644
--- a/drivers/media/dvb/dvb-usb/af9015.h
+++ b/drivers/media/dvb/dvb-usb/af9015.h
@@ -27,7 +27,6 @@
 #define DVB_USB_LOG_PREFIX "af9015"
 #include "dvb-usb.h"
 
-extern int dvb_usb_af9015_debug;
 #define deb_info(args...) dprintk(dvb_usb_af9015_debug, 0x01, args)
 #define deb_rc(args...)   dprintk(dvb_usb_af9015_debug, 0x02, args)
 #define deb_xfer(args...) dprintk(dvb_usb_af9015_debug, 0x04, args)
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index c786359fba03..cd2edbcaa097 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -46,7 +46,7 @@ module_param_named(delsys, dvb_usb_anysee_delsys, int, 0644);
 MODULE_PARM_DESC(delsys, "select delivery mode (0=DVB-C, 1=DVB-T)");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-static struct mutex anysee_usb_mutex;
+static DEFINE_MUTEX(anysee_usb_mutex);
 
 static int anysee_ctrl_msg(struct dvb_usb_device *d, u8 *sbuf, u8 slen,
         u8 *rbuf, u8 rlen)
@@ -456,8 +456,6 @@ static int anysee_probe(struct usb_interface *intf,
         struct usb_host_interface *alt;
         int ret;
 
-        mutex_init(&anysee_usb_mutex);
-
         /* There is one interface with two alternate settings.
            Alternate setting 0 is for bulk transfer.
            Alternate setting 1 is for isochronous transfer.
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index 5cef12a07f72..6fe71c6745eb 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -13,14 +13,14 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
 {
         int actlen,ret = -ENOMEM;
 
+        if (!d || wbuf == NULL || wlen == 0)
+                return -EINVAL;
+
         if (d->props.generic_bulk_ctrl_endpoint == 0) {
                 err("endpoint for generic control not specified.");
                 return -EINVAL;
         }
 
-        if (wbuf == NULL || wlen == 0)
-                return -EINVAL;
-
         if ((ret = mutex_lock_interruptible(&d->usb_mutex)))
                 return ret;
 
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index 21c1060cf10e..692b68a9e73b 100644
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -1187,7 +1187,7 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
         if (tmp)
                 *status |= FE_HAS_SYNC | FE_HAS_LOCK;
 
-        if (!*status & FE_HAS_SIGNAL) {
+        if (!(*status & FE_HAS_SIGNAL)) {
                 /* AGC lock */
                 ret = af9013_read_reg_bits(state, 0xd1a0, 6, 1, &tmp);
                 if (ret)
@@ -1196,7 +1196,7 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
                         *status |= FE_HAS_SIGNAL;
         }
 
-        if (!*status & FE_HAS_CARRIER) {
+        if (!(*status & FE_HAS_CARRIER)) {
                 /* CFO lock */
                 ret = af9013_read_reg_bits(state, 0xd333, 7, 1, &tmp);
                 if (ret)
@@ -1205,7 +1205,7 @@ static int af9013_read_status(struct dvb_frontend *fe, fe_status_t *status)
                         *status |= FE_HAS_CARRIER;
         }
 
-        if (!*status & FE_HAS_CARRIER) {
+        if (!(*status & FE_HAS_CARRIER)) {
                 /* SFOE lock */
                 ret = af9013_read_reg_bits(state, 0xd334, 6, 1, &tmp);
                 if (ret)
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 04cd7c04bdde..5189c4eb439f 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -355,6 +355,20 @@ config USB_SI470X
         tristate "Silicon Labs Si470x FM Radio Receiver support"
         depends on USB && VIDEO_V4L2
         ---help---
+          This is a driver for USB devices with the Silicon Labs SI470x
+          chip. Currently these devices are known to work:
+          - 10c4:818a: Silicon Labs USB FM Radio Reference Design
+          - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music)
+          - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700)
+
+          Sound is provided by the ALSA USB Audio/MIDI driver. Therefore
+          if you don't want to use the device solely for RDS receiving,
+          it is recommended to also select SND_USB_AUDIO.
+
+          Please have a look at the documentation, especially on how
+          to redirect the audio stream from the radio to your sound device:
+          Documentation/video4linux/si470x.txt
+
           Say Y here if you want to connect this type of radio to your
           computer's USB port.
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 5920cd306975..3e1830293de5 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -4,6 +4,7 @@
  *  Driver for USB radios for the Silicon Labs Si470x FM Radio Receivers:
  *   - Silicon Labs USB FM Radio Reference Design
  *   - ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF)
+ *   - KWorld USB FM Radio SnapMusic Mobile 700 (FM700)
  *
  *  Copyright (c) 2008 Tobias Lorenz <tobias.lorenz@gmx.net>
  *
@@ -24,19 +25,6 @@
 
 
 /*
- * User Notes:
- * - USB Audio is provided by the alsa snd_usb_audio module.
- *   For listing you have to redirect the sound, for example using:
- *   arecord -D hw:1,0 -r96000 -c2 -f S16_LE | artsdsp aplay -B -
- * - regarding module parameters in /sys/module/radio_si470x/parameters:
- *   the contents of read-only files (0444) are not updated, even if
- *   space, band and de are changed using private video controls
- * - increase tune_timeout, if you often get -EIO errors
- * - hw_freq_seek returns -EAGAIN, when timed out or band limit is reached
- */
-
-
-/*
  * History:
  * 2008-01-12   Tobias Lorenz <tobias.lorenz@gmx.net>
  *              Version 1.0.0
@@ -105,6 +93,9 @@
  *              - afc indication
  *              - more safety checks, let si470x_get_freq return errno
  *              - vidioc behavior corrected according to v4l2 spec
+ * 2008-10-20   Alexey Klimov <klimov.linux@gmail.com>
+ *              - add support for KWorld USB FM Radio FM700
+ *              - blacklisted KWorld radio in hid-core.c and hid-ids.h
  *
  * ToDo:
  * - add firmware download/update support
@@ -145,6 +136,8 @@ static struct usb_device_id si470x_usb_driver_id_table[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x10c4, 0x818a, USB_CLASS_HID, 0, 0) },
         /* ADS/Tech FM Radio Receiver (formerly Instant FM Music) */
         { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) },
+        /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) },
         /* Terminating entry */
         { }
 };
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index a8c068e1de1c..1740b9ebdcef 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -1476,12 +1476,9 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
 {
         struct cafe_camera *cam;
 
-        lock_kernel();
         cam = cafe_find_dev(iminor(inode));
-        if (cam == NULL) {
-                unlock_kernel();
+        if (cam == NULL)
                 return -ENODEV;
-        }
         filp->private_data = cam;
 
         mutex_lock(&cam->s_mutex);
@@ -1493,7 +1490,6 @@ static int cafe_v4l_open(struct inode *inode, struct file *filp)
         }
         (cam->users)++;
         mutex_unlock(&cam->s_mutex);
-        unlock_kernel();
         return 0;
 }
 
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index bd5d9de5a008..e6ca4012b5f0 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -867,6 +867,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
         case VIDIOC_STREAMON32:
         case VIDIOC_STREAMOFF32:
         case VIDIOC_G_PARM:
+        case VIDIOC_S_PARM:
         case VIDIOC_G_STD:
         case VIDIOC_S_STD:
         case VIDIOC_G_TUNER:
@@ -885,6 +886,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
         case VIDIOC_S_INPUT32:
         case VIDIOC_TRY_FMT32:
         case VIDIOC_S_HW_FREQ_SEEK:
+        case VIDIOC_ENUM_FRAMESIZES:
+        case VIDIOC_ENUM_FRAMEINTERVALS:
                 ret = do_video_ioctl(file, cmd, arg);
                 break;
 
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 7a1a7830a6b3..7874d9790a51 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -448,7 +448,14 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
         mutex_init(&cx->gpio_lock);
 
         spin_lock_init(&cx->lock);
-        spin_lock_init(&cx->dma_reg_lock);
+
+        cx->work_queue = create_singlethread_workqueue(cx->name);
+        if (cx->work_queue == NULL) {
+                CX18_ERR("Could not create work queue\n");
+                return -1;
+        }
+
+        INIT_WORK(&cx->work, cx18_work_handler);
 
         /* start counting open_id at 1 */
         cx->open_id = 1;
@@ -581,10 +588,10 @@ static void cx18_load_and_init_modules(struct cx18 *cx)
 
 #ifdef MODULE
         /* load modules */
-#ifndef CONFIG_MEDIA_TUNER
+#ifdef CONFIG_MEDIA_TUNER_MODULE
         hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER);
 #endif
-#ifndef CONFIG_VIDEO_CS5345
+#ifdef CONFIG_VIDEO_CS5345_MODULE
         hw = cx18_request_module(cx, hw, "cs5345", CX18_HW_CS5345);
 #endif
 #endif
@@ -832,6 +839,7 @@ free_map:
 free_mem:
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 free_workqueue:
+        destroy_workqueue(cx->work_queue);
 err:
         if (retval == 0)
                 retval = -ENODEV;
@@ -932,6 +940,9 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         cx18_halt_firmware(cx);
 
+        flush_workqueue(cx->work_queue);
+        destroy_workqueue(cx->work_queue);
+
         cx18_streams_cleanup(cx, 1);
 
         exit_cx18_i2c(cx);
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index a4b1708fafe7..bbdd5f25041d 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -199,12 +199,15 @@ struct cx18_options {
 #define CX18_F_S_APPL_IO        8       /* this stream is used read/written by an application */
 
 /* per-cx18, i_flags */
-#define CX18_F_I_LOADED_FW      0       /* Loaded the firmware the first time */
-#define CX18_F_I_EOS            4       /* End of encoder stream reached */
-#define CX18_F_I_RADIO_USER     5       /* The radio tuner is selected */
-#define CX18_F_I_ENC_PAUSED     13      /* the encoder is paused */
-#define CX18_F_I_INITED         21      /* set after first open */
-#define CX18_F_I_FAILED         22      /* set if first open failed */
+#define CX18_F_I_LOADED_FW              0       /* Loaded firmware 1st time */
+#define CX18_F_I_EOS                    4       /* End of encoder stream */
+#define CX18_F_I_RADIO_USER             5       /* radio tuner is selected */
+#define CX18_F_I_ENC_PAUSED             13      /* the encoder is paused */
+#define CX18_F_I_HAVE_WORK              15      /* there is work to be done */
+#define CX18_F_I_WORK_HANDLER_DVB       18      /* work to be done for DVB */
+#define CX18_F_I_INITED                 21      /* set after first open */
+#define CX18_F_I_FAILED                 22      /* set if first open failed */
+#define CX18_F_I_WORK_INITED            23      /* worker thread initialized */
 
 /* These are the VBI types as they appear in the embedded VBI private packets. */
 #define CX18_SLICED_TYPE_TELETEXT_B     (1)
@@ -402,8 +405,6 @@ struct cx18 {
         spinlock_t lock;        /* lock access to this struct */
         int search_pack_header;
 
-        spinlock_t dma_reg_lock; /* lock access to DMA engine registers */
-
         int open_id;            /* incremented each time an open occurs, used as
                                    unique ID. Starts at 1, so 0 can be used as
                                    uninitialized value in the stream->id. */
@@ -433,6 +434,9 @@ struct cx18 {
         /* when the current DMA is finished this queue is woken up */
         wait_queue_head_t dma_waitq;
 
+        struct workqueue_struct *work_queue;
+        struct work_struct work;
+
         /* i2c */
         struct i2c_adapter i2c_adap[2];
         struct i2c_algo_bit_data i2c_algo[2];
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index afc694e7bdb2..4542e2e5e3d7 100644
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -23,6 +23,8 @@
 #include "cx18-dvb.h"
 #include "cx18-io.h"
 #include "cx18-streams.h"
+#include "cx18-queue.h"
+#include "cx18-scb.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
 #include "mxl5005s.h"
@@ -300,3 +302,24 @@ static int dvb_register(struct cx18_stream *stream)
 
         return ret;
 }
+
+void cx18_dvb_work_handler(struct cx18 *cx)
+{
+        struct cx18_buffer *buf;
+        struct cx18_stream *s = &cx->streams[CX18_ENC_STREAM_TYPE_TS];
+
+        while ((buf = cx18_dequeue(s, &s->q_full)) != NULL) {
+                if (s->dvb.enabled)
+                        dvb_dmx_swfilter(&s->dvb.demux, buf->buf,
+                                         buf->bytesused);
+
+                cx18_enqueue(s, buf, &s->q_free);
+                cx18_buf_sync_for_device(s, buf);
+                if (s->handle == CX18_INVALID_TASK_HANDLE) /* FIXME: improve */
+                        continue;
+
+                cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
+                       (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
+                       1, buf->id, s->buf_size);
+        }
+}
diff --git a/drivers/media/video/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h
index bf8d8f6f5455..bbdcefc87f28 100644
--- a/drivers/media/video/cx18/cx18-dvb.h
+++ b/drivers/media/video/cx18/cx18-dvb.h
@@ -23,3 +23,4 @@
 
 int cx18_dvb_register(struct cx18_stream *stream);
 void cx18_dvb_unregister(struct cx18_stream *stream);
+void cx18_dvb_work_handler(struct cx18 *cx);
diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c
index 700ab9439c16..220fae8d4ad7 100644
--- a/drivers/media/video/cx18/cx18-io.c
+++ b/drivers/media/video/cx18/cx18-io.c
@@ -88,6 +88,19 @@ void cx18_writel_retry(struct cx18 *cx, u32 val, void __iomem *addr)
         cx18_log_write_retries(cx, i, addr);
 }
 
+void _cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr,
+                         u32 eval, u32 mask)
+{
+        int i;
+        eval &= mask;
+        for (i = 0; i < CX18_MAX_MMIO_RETRIES; i++) {
+                cx18_writel_noretry(cx, val, addr);
+                if (eval == (cx18_readl_noretry(cx, addr) & mask))
+                        break;
+        }
+        cx18_log_write_retries(cx, i, addr);
+}
+
 void cx18_writew_retry(struct cx18 *cx, u16 val, void __iomem *addr)
 {
         int i;
@@ -218,7 +231,7 @@ void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count)
 void cx18_sw1_irq_enable(struct cx18 *cx, u32 val)
 {
         u32 r;
-        cx18_write_reg(cx, val, SW1_INT_STATUS);
+        cx18_write_reg_expect(cx, val, SW1_INT_STATUS, ~val, val);
         r = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
         cx18_write_reg(cx, r | val, SW1_INT_ENABLE_PCI);
 }
@@ -233,7 +246,7 @@ void cx18_sw1_irq_disable(struct cx18 *cx, u32 val)
 void cx18_sw2_irq_enable(struct cx18 *cx, u32 val)
 {
         u32 r;
-        cx18_write_reg(cx, val, SW2_INT_STATUS);
+        cx18_write_reg_expect(cx, val, SW2_INT_STATUS, ~val, val);
         r = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
         cx18_write_reg(cx, r | val, SW2_INT_ENABLE_PCI);
 }
diff --git a/drivers/media/video/cx18/cx18-io.h b/drivers/media/video/cx18/cx18-io.h
index 287a5e8bf67b..425244453ea7 100644
--- a/drivers/media/video/cx18/cx18-io.h
+++ b/drivers/media/video/cx18/cx18-io.h
@@ -133,6 +133,8 @@ static inline void cx18_writel(struct cx18 *cx, u32 val, void __iomem *addr)
                 cx18_writel_noretry(cx, val, addr);
 }
 
+void _cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr,
+                         u32 eval, u32 mask);
 
 static inline
 void cx18_writew_noretry(struct cx18 *cx, u16 val, void __iomem *addr)
@@ -271,6 +273,21 @@ static inline void cx18_write_reg(struct cx18 *cx, u32 val, u32 reg)
                 cx18_write_reg_noretry(cx, val, reg);
 }
 
+static inline void _cx18_write_reg_expect(struct cx18 *cx, u32 val, u32 reg,
+                                          u32 eval, u32 mask)
+{
+        _cx18_writel_expect(cx, val, cx->reg_mem + reg, eval, mask);
+}
+
+static inline void cx18_write_reg_expect(struct cx18 *cx, u32 val, u32 reg,
+                                         u32 eval, u32 mask)
+{
+        if (cx18_retry_mmio)
+                _cx18_write_reg_expect(cx, val, reg, eval, mask);
+        else
+                cx18_write_reg_noretry(cx, val, reg);
+}
+
 
 static inline u32 cx18_read_reg_noretry(struct cx18 *cx, u32 reg)
 {
diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c
index 360330f5463f..5fbfbd0f1493 100644
--- a/drivers/media/video/cx18/cx18-irq.c
+++ b/drivers/media/video/cx18/cx18-irq.c
@@ -29,8 +29,20 @@
 #include "cx18-mailbox.h"
 #include "cx18-vbi.h"
 #include "cx18-scb.h"
+#include "cx18-dvb.h"
 
-#define DMA_MAGIC_COOKIE 0x000001fe
+void cx18_work_handler(struct work_struct *work)
+{
+        struct cx18 *cx = container_of(work, struct cx18, work);
+        if (test_and_clear_bit(CX18_F_I_WORK_INITED, &cx->i_flags)) {
+                struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
+                /* This thread must use the FIFO scheduler as it
+                 * is realtime sensitive. */
+                sched_setscheduler(current, SCHED_FIFO, &param);
+        }
+        if (test_and_clear_bit(CX18_F_I_WORK_HANDLER_DVB, &cx->i_flags))
+                cx18_dvb_work_handler(cx);
+}
 
 static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
 {
@@ -67,17 +79,11 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
         if (buf) {
                 cx18_buf_sync_for_cpu(s, buf);
                 if (s->type == CX18_ENC_STREAM_TYPE_TS && s->dvb.enabled) {
-                        /* process the buffer here */
-                        CX18_DEBUG_HI_DMA("TS recv and sent bytesused=%d\n",
-                                        buf->bytesused);
-
-                        dvb_dmx_swfilter(&s->dvb.demux, buf->buf,
+                        CX18_DEBUG_HI_DMA("TS recv bytesused = %d\n",
                                         buf->bytesused);
 
-                        cx18_buf_sync_for_device(s, buf);
-                        cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
-                            (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
-                            1, buf->id, s->buf_size);
+                        set_bit(CX18_F_I_WORK_HANDLER_DVB, &cx->i_flags);
+                        set_bit(CX18_F_I_HAVE_WORK, &cx->i_flags);
                 } else
                         set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);
         } else {
@@ -109,7 +115,7 @@ static void epu_debug(struct cx18 *cx, struct cx18_mailbox *mb)
                 CX18_INFO("FW version: %s\n", p - 1);
 }
 
-static void hpu_cmd(struct cx18 *cx, u32 sw1)
+static void epu_cmd(struct cx18 *cx, u32 sw1)
 {
         struct cx18_mailbox mb;
 
@@ -125,12 +131,31 @@ static void hpu_cmd(struct cx18 *cx, u32 sw1)
                         epu_debug(cx, &mb);
                         break;
                 default:
-                        CX18_WARN("Unexpected mailbox command %08x\n", mb.cmd);
+                        CX18_WARN("Unknown CPU_TO_EPU mailbox command %#08x\n",
+                                  mb.cmd);
                         break;
                 }
         }
-        if (sw1 & (IRQ_APU_TO_EPU | IRQ_HPU_TO_EPU))
-                CX18_WARN("Unexpected interrupt %08x\n", sw1);
+
+        if (sw1 & IRQ_APU_TO_EPU) {
+                cx18_memcpy_fromio(cx, &mb, &cx->scb->apu2epu_mb, sizeof(mb));
+                CX18_WARN("Unknown APU_TO_EPU mailbox command %#08x\n", mb.cmd);
+        }
+
+        if (sw1 & IRQ_HPU_TO_EPU) {
+                cx18_memcpy_fromio(cx, &mb, &cx->scb->hpu2epu_mb, sizeof(mb));
+                CX18_WARN("Unknown HPU_TO_EPU mailbox command %#08x\n", mb.cmd);
+        }
+}
+
+static void xpu_ack(struct cx18 *cx, u32 sw2)
+{
+        if (sw2 & IRQ_CPU_TO_EPU_ACK)
+                wake_up(&cx->mb_cpu_waitq);
+        if (sw2 & IRQ_APU_TO_EPU_ACK)
+                wake_up(&cx->mb_apu_waitq);
+        if (sw2 & IRQ_HPU_TO_EPU_ACK)
+                wake_up(&cx->mb_hpu_waitq);
 }
 
 irqreturn_t cx18_irq_handler(int irq, void *dev_id)
@@ -140,43 +165,36 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
         u32 sw2, sw2_mask;
         u32 hw2, hw2_mask;
 
-        spin_lock(&cx->dma_reg_lock);
-
+        sw1_mask = cx18_read_reg(cx, SW1_INT_ENABLE_PCI);
+        sw1 = cx18_read_reg(cx, SW1_INT_STATUS) & sw1_mask;
+        sw2_mask = cx18_read_reg(cx, SW2_INT_ENABLE_PCI);
+        sw2 = cx18_read_reg(cx, SW2_INT_STATUS) & sw2_mask;
         hw2_mask = cx18_read_reg(cx, HW2_INT_MASK5_PCI);
         hw2 = cx18_read_reg(cx, HW2_INT_CLR_STATUS) & hw2_mask;
-        sw2_mask = cx18_read_reg(cx, SW2_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU_ACK;
-        sw2 = cx18_read_reg(cx, SW2_INT_STATUS) & sw2_mask;
-        sw1_mask = cx18_read_reg(cx, SW1_INT_ENABLE_PCI) | IRQ_EPU_TO_HPU;
-        sw1 = cx18_read_reg(cx, SW1_INT_STATUS) & sw1_mask;
 
-        cx18_write_reg(cx, sw2&sw2_mask, SW2_INT_STATUS);
-        cx18_write_reg(cx, sw1&sw1_mask, SW1_INT_STATUS);
-        cx18_write_reg(cx, hw2&hw2_mask, HW2_INT_CLR_STATUS);
+        if (sw1)
+                cx18_write_reg_expect(cx, sw1, SW1_INT_STATUS, ~sw1, sw1);
+        if (sw2)
+                cx18_write_reg_expect(cx, sw2, SW2_INT_STATUS, ~sw2, sw2);
+        if (hw2)
+                cx18_write_reg_expect(cx, hw2, HW2_INT_CLR_STATUS, ~hw2, hw2);
 
         if (sw1 || sw2 || hw2)
                 CX18_DEBUG_HI_IRQ("SW1: %x  SW2: %x  HW2: %x\n", sw1, sw2, hw2);
 
         /* To do: interrupt-based I2C handling
-        if (hw2 & 0x00c00000) {
+        if (hw2 & (HW2_I2C1_INT|HW2_I2C2_INT)) {
         }
         */
 
-        if (sw2) {
-                if (sw2 & (cx18_readl(cx, &cx->scb->cpu2hpu_irq_ack) |
-                           cx18_readl(cx, &cx->scb->cpu2epu_irq_ack)))
-                        wake_up(&cx->mb_cpu_waitq);
-                if (sw2 & (cx18_readl(cx, &cx->scb->apu2hpu_irq_ack) |
-                           cx18_readl(cx, &cx->scb->apu2epu_irq_ack)))
-                        wake_up(&cx->mb_apu_waitq);
-                if (sw2 & cx18_readl(cx, &cx->scb->epu2hpu_irq_ack))
-                        wake_up(&cx->mb_epu_waitq);
-                if (sw2 & cx18_readl(cx, &cx->scb->hpu2epu_irq_ack))
-                        wake_up(&cx->mb_hpu_waitq);
-        }
+        if (sw2)
+                xpu_ack(cx, sw2);
 
         if (sw1)
-                hpu_cmd(cx, sw1);
-        spin_unlock(&cx->dma_reg_lock);
+                epu_cmd(cx, sw1);
+
+        if (test_and_clear_bit(CX18_F_I_HAVE_WORK, &cx->i_flags))
+                queue_work(cx->work_queue, &cx->work);
 
-        return (hw2 | sw1 | sw2) ? IRQ_HANDLED : IRQ_NONE;
+        return (sw1 || sw2 || hw2) ? IRQ_HANDLED : IRQ_NONE;
 }
diff --git a/drivers/media/video/cx18/cx18-irq.h b/drivers/media/video/cx18/cx18-irq.h
index 379f704f5cba..6173ca3bc9e4 100644
--- a/drivers/media/video/cx18/cx18-irq.h
+++ b/drivers/media/video/cx18/cx18-irq.h
@@ -32,6 +32,4 @@
 
 irqreturn_t cx18_irq_handler(int irq, void *dev_id);
 
-void cx18_irq_work_handler(struct work_struct *work);
-void cx18_dma_stream_dec_prepare(struct cx18_stream *s, u32 offset, int lock);
-void cx18_unfinished_dma(unsigned long arg);
+void cx18_work_handler(struct work_struct *work);
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index 9d18dd22de76..acff7dfb60df 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -83,7 +83,7 @@ static const struct cx18_api_info api_info[] = {
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL_ACK,                 0),
         API_ENTRY(CPU, CX18_CPU_DE_SET_MDL,                     API_FAST),
         API_ENTRY(CPU, CX18_APU_RESETAI,                        API_FAST),
-        API_ENTRY(CPU, CX18_CPU_DE_RELEASE_MDL,                 0),
+        API_ENTRY(CPU, CX18_CPU_DE_RELEASE_MDL,                 API_SLOW),
         API_ENTRY(0, 0,                                         0),
 };
 
@@ -176,7 +176,7 @@ long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb)
 
         cx18_setup_page(cx, SCB_OFFSET);
         cx18_write_sync(cx, mb->request, &ack_mb->ack);
-        cx18_write_reg(cx, ack_irq, SW2_INT_SET);
+        cx18_write_reg_expect(cx, ack_irq, SW2_INT_SET, ack_irq, ack_irq);
         return 0;
 }
 
@@ -225,7 +225,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
         }
         if (info->flags & API_FAST)
                 timeout /= 2;
-        cx18_write_reg(cx, irq, SW1_INT_SET);
+        cx18_write_reg_expect(cx, irq, SW1_INT_SET, irq, irq);
 
         while (!sig && cx18_readl(cx, &mb->ack) != cx18_readl(cx, &mb->request)
                && cnt < 660) {
diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index a33ba04a2686..174682c2582f 100644
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -88,15 +88,13 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
 
                 if (buf->id != id)
                         continue;
+
                 buf->bytesused = bytesused;
-                /* the transport buffers are handled differently,
-                   they are not moved to the full queue */
-                if (s->type != CX18_ENC_STREAM_TYPE_TS) {
-                        atomic_dec(&s->q_free.buffers);
-                        atomic_inc(&s->q_full.buffers);
-                        s->q_full.bytesused += buf->bytesused;
-                        list_move_tail(&buf->list, &s->q_full.list);
-                }
+                atomic_dec(&s->q_free.buffers);
+                atomic_inc(&s->q_full.buffers);
+                s->q_full.bytesused += buf->bytesused;
+                list_move_tail(&buf->list, &s->q_full.list);
+
                 spin_unlock(&s->qlock);
                 return buf;
         }
diff --git a/drivers/media/video/cx18/cx18-scb.h b/drivers/media/video/cx18/cx18-scb.h
index 86b4cb15d163..594713bbed68 100644
--- a/drivers/media/video/cx18/cx18-scb.h
+++ b/drivers/media/video/cx18/cx18-scb.h
@@ -128,22 +128,22 @@ struct cx18_scb {
         u32 apu2cpu_irq;
         /* Value to write to register SW2 register set (0xC7003140) after the
            command is cleared */
-        u32 apu2cpu_irq_ack;
+        u32 cpu2apu_irq_ack;
         u32 reserved2[13];
 
         u32 hpu2cpu_mb_offset;
         u32 hpu2cpu_irq;
-        u32 hpu2cpu_irq_ack;
+        u32 cpu2hpu_irq_ack;
         u32 reserved3[13];
 
         u32 ppu2cpu_mb_offset;
         u32 ppu2cpu_irq;
-        u32 ppu2cpu_irq_ack;
+        u32 cpu2ppu_irq_ack;
         u32 reserved4[13];
 
         u32 epu2cpu_mb_offset;
         u32 epu2cpu_irq;
-        u32 epu2cpu_irq_ack;
+        u32 cpu2epu_irq_ack;
         u32 reserved5[13];
         u32 reserved6[8];
 
@@ -153,22 +153,22 @@ struct cx18_scb {
         u32 reserved11[7];
         u32 cpu2apu_mb_offset;
         u32 cpu2apu_irq;
-        u32 cpu2apu_irq_ack;
+        u32 apu2cpu_irq_ack;
         u32 reserved12[13];
 
         u32 hpu2apu_mb_offset;
         u32 hpu2apu_irq;
-        u32 hpu2apu_irq_ack;
+        u32 apu2hpu_irq_ack;
         u32 reserved13[13];
 
         u32 ppu2apu_mb_offset;
         u32 ppu2apu_irq;
-        u32 ppu2apu_irq_ack;
+        u32 apu2ppu_irq_ack;
         u32 reserved14[13];
 
         u32 epu2apu_mb_offset;
         u32 epu2apu_irq;
-        u32 epu2apu_irq_ack;
+        u32 apu2epu_irq_ack;
         u32 reserved15[13];
         u32 reserved16[8];
 
@@ -178,22 +178,22 @@ struct cx18_scb {
         u32 reserved21[7];
         u32 cpu2hpu_mb_offset;
         u32 cpu2hpu_irq;
-        u32 cpu2hpu_irq_ack;
+        u32 hpu2cpu_irq_ack;
         u32 reserved22[13];
 
         u32 apu2hpu_mb_offset;
         u32 apu2hpu_irq;
-        u32 apu2hpu_irq_ack;
+        u32 hpu2apu_irq_ack;
         u32 reserved23[13];
 
         u32 ppu2hpu_mb_offset;
         u32 ppu2hpu_irq;
-        u32 ppu2hpu_irq_ack;
+        u32 hpu2ppu_irq_ack;
         u32 reserved24[13];
 
         u32 epu2hpu_mb_offset;
         u32 epu2hpu_irq;
-        u32 epu2hpu_irq_ack;
+        u32 hpu2epu_irq_ack;
         u32 reserved25[13];
         u32 reserved26[8];
 
@@ -203,22 +203,22 @@ struct cx18_scb {
         u32 reserved31[7];
         u32 cpu2ppu_mb_offset;
         u32 cpu2ppu_irq;
-        u32 cpu2ppu_irq_ack;
+        u32 ppu2cpu_irq_ack;
         u32 reserved32[13];
 
         u32 apu2ppu_mb_offset;
         u32 apu2ppu_irq;
-        u32 apu2ppu_irq_ack;
+        u32 ppu2apu_irq_ack;
         u32 reserved33[13];
 
         u32 hpu2ppu_mb_offset;
         u32 hpu2ppu_irq;
-        u32 hpu2ppu_irq_ack;
+        u32 ppu2hpu_irq_ack;
         u32 reserved34[13];
 
         u32 epu2ppu_mb_offset;
         u32 epu2ppu_irq;
-        u32 epu2ppu_irq_ack;
+        u32 ppu2epu_irq_ack;
         u32 reserved35[13];
         u32 reserved36[8];
 
@@ -228,22 +228,22 @@ struct cx18_scb {
         u32 reserved41[7];
         u32 cpu2epu_mb_offset;
         u32 cpu2epu_irq;
-        u32 cpu2epu_irq_ack;
+        u32 epu2cpu_irq_ack;
         u32 reserved42[13];
 
         u32 apu2epu_mb_offset;
         u32 apu2epu_irq;
-        u32 apu2epu_irq_ack;
+        u32 epu2apu_irq_ack;
         u32 reserved43[13];
 
         u32 hpu2epu_mb_offset;
         u32 hpu2epu_irq;
-        u32 hpu2epu_irq_ack;
+        u32 epu2hpu_irq_ack;
         u32 reserved44[13];
 
         u32 ppu2epu_mb_offset;
         u32 ppu2epu_irq;
-        u32 ppu2epu_irq_ack;
+        u32 epu2ppu_irq_ack;
         u32 reserved45[13];
         u32 reserved46[8];
 
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 078be6319556..d3ae5b4dfca7 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1078,7 +1078,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
                 }
         }
 
-        if (blackbird_initialize_codec(dev) < 0) {
+        if (!atomic_read(&dev->core->mpeg_users) && blackbird_initialize_codec(dev) < 0) {
                 if (drv)
                         drv->request_release(drv);
                 unlock_kernel();
@@ -1109,6 +1109,8 @@ static int mpeg_open(struct inode *inode, struct file *file)
                         fh->mpegq.field);
         unlock_kernel();
 
+        atomic_inc(&dev->core->mpeg_users);
+
         return 0;
 }
 
@@ -1118,7 +1120,7 @@ static int mpeg_release(struct inode *inode, struct file *file)
         struct cx8802_dev *dev = fh->dev;
         struct cx8802_driver *drv = NULL;
 
-        if (dev->mpeg_active)
+        if (dev->mpeg_active && atomic_read(&dev->core->mpeg_users) == 1)
                 blackbird_stop_codec(dev);
 
         cx8802_cancel_buffers(fh->dev);
@@ -1138,6 +1140,8 @@ static int mpeg_release(struct inode *inode, struct file *file)
         if (drv)
                 drv->request_release(drv);
 
+        atomic_dec(&dev->core->mpeg_users);
+
         return 0;
 }
 
@@ -1158,6 +1162,10 @@ static unsigned int
 mpeg_poll(struct file *file, struct poll_table_struct *wait)
 {
         struct cx8802_fh *fh = file->private_data;
+        struct cx8802_dev *dev = fh->dev;
+
+        if (!dev->mpeg_active)
+                blackbird_start_codec(file, fh);
 
         return videobuf_poll_stream(file, &fh->mpegq, wait);
 }
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index cf6c30d4e545..309ca5e68063 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -598,6 +598,11 @@ static int dvb_register(struct cx8802_dev *dev)
         struct videobuf_dvb_frontend *fe0, *fe1 = NULL;
         int mfe_shared = 0; /* bus not shared by default */
 
+        if (0 != core->i2c_rc) {
+                printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name);
+                goto frontend_detach;
+        }
+
         /* Get the first frontend */
         fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
         if (!fe0)
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index a1c435b4b1cd..3ebdcd1d83f8 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -769,10 +769,6 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
         struct cx8802_dev *dev;
         struct cx88_core  *core;
         int err;
-#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
-        struct videobuf_dvb_frontend *demod;
-        int i;
-#endif
 
         /* general setup */
         core = cx88_core_get(pci_dev);
@@ -803,15 +799,21 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
         mutex_init(&dev->frontends.lock);
         INIT_LIST_HEAD(&dev->frontends.felist);
 
-        if (core->board.num_frontends)
-                printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends);
-
-        for (i = 1; i <= core->board.num_frontends; i++) {
-                demod = videobuf_dvb_alloc_frontend(&dev->frontends, i);
-                if(demod == NULL) {
-                        printk(KERN_ERR "%s() failed to alloc\n", __func__);
-                        err = -ENOMEM;
-                        goto fail_free;
+        if (core->board.num_frontends) {
+                struct videobuf_dvb_frontend *fe;
+                int i;
+
+                printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__,
+                        core->board.num_frontends);
+                for (i = 1; i <= core->board.num_frontends; i++) {
+                        fe = videobuf_dvb_alloc_frontend(&dev->frontends, i);
+                        if(fe == NULL) {
+                                printk(KERN_ERR "%s() failed to alloc\n",
+                                        __func__);
+                                videobuf_dvb_dealloc_frontends(&dev->frontends);
+                                err = -ENOMEM;
+                                goto fail_free;
+                        }
                 }
         }
 #endif
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 61265fd04d56..b96ce991d968 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1216,8 +1216,12 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
         struct cx8800_fh  *fh   = priv;
         struct cx8800_dev *dev  = fh->dev;
 
-        if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
+        /* We should remember that this driver also supports teletext,  */
+        /* so we have to test if the v4l2_buf_type is VBI capture data. */
+        if (unlikely((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
+                     (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE)))
                 return -EINVAL;
+
         if (unlikely(i != fh->type))
                 return -EINVAL;
 
@@ -1232,8 +1236,10 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
         struct cx8800_dev *dev  = fh->dev;
         int               err, res;
 
-        if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
+            (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
                 return -EINVAL;
+
         if (i != fh->type)
                 return -EINVAL;
 
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 76207c2856b7..f4240965be32 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -352,6 +352,7 @@ struct cx88_core {
         /* various v4l controls */
         u32                        freq;
         atomic_t                   users;
+        atomic_t                   mpeg_users;
 
         /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
         struct cx8802_dev          *dvbdev;
diff --git a/drivers/media/video/gspca/Kconfig b/drivers/media/video/gspca/Kconfig
index 4d0817471c9f..6b557c057fac 100644
--- a/drivers/media/video/gspca/Kconfig
+++ b/drivers/media/video/gspca/Kconfig
@@ -3,16 +3,16 @@ menuconfig USB_GSPCA
         depends on VIDEO_V4L2
         default m
         ---help---
-        Say Y here if you want to enable selecting webcams based
-        on the GSPCA framework.
+          Say Y here if you want to enable selecting webcams based
+          on the GSPCA framework.
 
-        See <file:Documentation/video4linux/gspca.txt> for more info.
+          See <file:Documentation/video4linux/gspca.txt> for more info.
 
-        This driver uses the Video For Linux API. You must say Y or M to
-        "Video For Linux" to use this driver.
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
 
-        To compile this driver as modules, choose M here: the
-        modules will be called gspca_main.
+          To compile this driver as modules, choose M here: the
+          modules will be called gspca_main.
 
 
 if USB_GSPCA && VIDEO_V4L2
@@ -23,190 +23,190 @@ config USB_GSPCA_CONEX
         tristate "Conexant Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Conexant chip.
+          Say Y here if you want support for cameras based on the Conexant chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_conex.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_conex.
 
 config USB_GSPCA_ETOMS
         tristate "Etoms USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Etoms chip.
+          Say Y here if you want support for cameras based on the Etoms chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_etoms.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_etoms.
 
 config USB_GSPCA_FINEPIX
         tristate "Fujifilm FinePix USB V4L2 driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the FinePix chip.
+          Say Y here if you want support for cameras based on the FinePix chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_finepix.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_finepix.
 
 config USB_GSPCA_MARS
         tristate "Mars USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Mars chip.
+          Say Y here if you want support for cameras based on the Mars chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_mars.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_mars.
 
 config USB_GSPCA_OV519
         tristate "OV519 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the OV519 chip.
+          Say Y here if you want support for cameras based on the OV519 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_ov519.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_ov519.
 
 config USB_GSPCA_PAC207
         tristate "Pixart PAC207 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the PAC207 chip.
+          Say Y here if you want support for cameras based on the PAC207 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_pac207.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_pac207.
 
 config USB_GSPCA_PAC7311
         tristate "Pixart PAC7311 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the PAC7311 chip.
+          Say Y here if you want support for cameras based on the PAC7311 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_pac7311.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_pac7311.
 
 config USB_GSPCA_SONIXB
         tristate "SN9C102 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SONIXB chip.
+          Say Y here if you want support for cameras based on the SONIXB chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_sonixb.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_sonixb.
 
 config USB_GSPCA_SONIXJ
         tristate "SONIX JPEG USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SONIXJ chip.
+          Say Y here if you want support for cameras based on the SONIXJ chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_sonixj
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_sonixj
 
 config USB_GSPCA_SPCA500
         tristate "SPCA500 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA500 chip.
+          Say Y here if you want support for cameras based on the SPCA500 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca500.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca500.
 
 config USB_GSPCA_SPCA501
         tristate "SPCA501 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA501 chip.
+          Say Y here if you want support for cameras based on the SPCA501 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca501.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca501.
 
 config USB_GSPCA_SPCA505
         tristate "SPCA505 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA505 chip.
+          Say Y here if you want support for cameras based on the SPCA505 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca505.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca505.
 
 config USB_GSPCA_SPCA506
         tristate "SPCA506 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA506 chip.
+          Say Y here if you want support for cameras based on the SPCA506 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca506.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca506.
 
 config USB_GSPCA_SPCA508
         tristate "SPCA508 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA508 chip.
+          Say Y here if you want support for cameras based on the SPCA508 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca508.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca508.
 
 config USB_GSPCA_SPCA561
         tristate "SPCA561 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the SPCA561 chip.
+          Say Y here if you want support for cameras based on the SPCA561 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca561.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca561.
 
 config USB_GSPCA_STK014
         tristate "Syntek DV4000 (STK014) USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the STK014 chip.
+          Say Y here if you want support for cameras based on the STK014 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_stk014.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_stk014.
 
 config USB_GSPCA_SUNPLUS
         tristate "SUNPLUS USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the Sunplus
-        SPCA504(abc) SPCA533 SPCA536 chips.
+          Say Y here if you want support for cameras based on the Sunplus
+          SPCA504(abc) SPCA533 SPCA536 chips.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_spca5xx.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_spca5xx.
 
 config USB_GSPCA_T613
         tristate "T613 (JPEG Compliance) USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the T613 chip.
+          Say Y here if you want support for cameras based on the T613 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_t613.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_t613.
 
 config USB_GSPCA_TV8532
         tristate "TV8532 USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the TV8531 chip.
+          Say Y here if you want support for cameras based on the TV8531 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_tv8532.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_tv8532.
 
 config USB_GSPCA_VC032X
         tristate "VC032X USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the VC032X chip.
+          Say Y here if you want support for cameras based on the VC032X chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_vc032x.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_vc032x.
 
 config USB_GSPCA_ZC3XX
-        tristate "VC3xx USB Camera Driver"
+        tristate "ZC3XX USB Camera Driver"
         depends on VIDEO_V4L2 && USB_GSPCA
         help
-        Say Y here if you want support for cameras based on the ZC3XX chip.
+          Say Y here if you want support for cameras based on the ZC3XX chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_zc3xx.
+          To compile this driver as a module, choose M here: the
+          module will be called gspca_zc3xx.
 
 endif
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index d0a4451dc46f..8b3101d347c3 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -2266,7 +2266,7 @@ static const struct usb_action hdcs2020b_NoFliker[] = {
         {}
 };
 
-static const struct usb_action hv7131bxx_Initial[] = {
+static const struct usb_action hv7131bxx_Initial[] = {          /* 320x240 */
         {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
         {0xa0, 0x10, ZC3XX_R002_CLOCKSELECT},
         {0xa0, 0x00, ZC3XX_R010_CMOSSENSORSELECT},
@@ -2290,7 +2290,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {0xaa, 0x14, 0x0001},
         {0xaa, 0x15, 0x00e8},
         {0xaa, 0x16, 0x0002},
-        {0xaa, 0x17, 0x0086},
+        {0xaa, 0x17, 0x0086},           /* 00,17,88,aa */
         {0xaa, 0x31, 0x0038},
         {0xaa, 0x32, 0x0038},
         {0xaa, 0x33, 0x0038},
@@ -2309,7 +2309,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {0xa0, 0x13, ZC3XX_R1CB_SHARPNESS05},
         {0xa0, 0x08, ZC3XX_R250_DEADPIXELSMODE},
         {0xa0, 0x08, ZC3XX_R301_EEPROMACCESS},
-        {0xaa, 0x02, 0x0080},   /* {0xaa, 0x02, 0x0090}; */
+        {0xaa, 0x02, 0x0090},                   /* 00,02,80,aa */
         {0xa1, 0x01, 0x0002},
         {0xa0, 0x00, ZC3XX_R092_I2CADDRESSSELECT},
         {0xa0, 0x02, ZC3XX_R090_I2CCOMMAND},
@@ -2374,7 +2374,7 @@ static const struct usb_action hv7131bxx_Initial[] = {
         {}
 };
 
-static const struct usb_action hv7131bxx_InitialScale[] = {
+static const struct usb_action hv7131bxx_InitialScale[] = {     /* 640x480*/
         {0xa0, 0x01, ZC3XX_R000_SYSTEMCONTROL},
         {0xa0, 0x00, ZC3XX_R002_CLOCKSELECT},
         {0xa0, 0x00, ZC3XX_R010_CMOSSENSORSELECT},
@@ -6388,6 +6388,8 @@ static void setbrightness(struct gspca_dev *gspca_dev)
 /*fixme: is it really write to 011d and 018d for all other sensors? */
         brightness = sd->brightness;
         reg_w(gspca_dev->dev, brightness, 0x011d);
+        if (sd->sensor == SENSOR_HV7131B)
+                return;
         if (brightness < 0x70)
                 brightness += 0x10;
         else
@@ -6529,6 +6531,7 @@ static void setquality(struct gspca_dev *gspca_dev)
 
         switch (sd->sensor) {
         case SENSOR_GC0305:
+        case SENSOR_HV7131B:
         case SENSOR_OV7620:
         case SENSOR_PO2030:
                 return;
@@ -7209,7 +7212,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
         mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
         zc3_init = init_tb[(int) sd->sensor][mode];
         switch (sd->sensor) {
-        case SENSOR_HV7131B:
         case SENSOR_HV7131C:
                 zcxx_probeSensor(gspca_dev);
                 break;
diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 0069898bddab..c46bfb1569e3 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_IVTV
         tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
-        depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
+        depends on VIDEO_V4L2 && PCI && I2C
         depends on INPUT   # due to VIDEO_IR
         select I2C_ALGOBIT
         select VIDEO_IR
@@ -12,7 +12,6 @@ config VIDEO_IVTV
         select VIDEO_SAA711X
         select VIDEO_SAA717X
         select VIDEO_SAA7127
-        select VIDEO_TVAUDIO
         select VIDEO_CS53L32A
         select VIDEO_M52790
         select VIDEO_WM8775
@@ -32,7 +31,7 @@ config VIDEO_IVTV
 
 config VIDEO_FB_IVTV
         tristate "Conexant cx23415 framebuffer support"
-        depends on VIDEO_IVTV && FB && EXPERIMENTAL
+        depends on VIDEO_IVTV && FB
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index d36485023b68..b69cc1d55e5b 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -875,43 +875,43 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
 
 #ifdef MODULE
         /* load modules */
-#ifndef CONFIG_MEDIA_TUNER
+#ifdef CONFIG_MEDIA_TUNER_MODULE
         hw = ivtv_request_module(itv, hw, "tuner", IVTV_HW_TUNER);
 #endif
-#ifndef CONFIG_VIDEO_CX25840
+#ifdef CONFIG_VIDEO_CX25840_MODULE
         hw = ivtv_request_module(itv, hw, "cx25840", IVTV_HW_CX25840);
 #endif
-#ifndef CONFIG_VIDEO_SAA711X
+#ifdef CONFIG_VIDEO_SAA711X_MODULE
         hw = ivtv_request_module(itv, hw, "saa7115", IVTV_HW_SAA711X);
 #endif
-#ifndef CONFIG_VIDEO_SAA7127
+#ifdef CONFIG_VIDEO_SAA7127_MODULE
         hw = ivtv_request_module(itv, hw, "saa7127", IVTV_HW_SAA7127);
 #endif
-#ifndef CONFIG_VIDEO_SAA717X
+#ifdef CONFIG_VIDEO_SAA717X_MODULE
         hw = ivtv_request_module(itv, hw, "saa717x", IVTV_HW_SAA717X);
 #endif
-#ifndef CONFIG_VIDEO_UPD64031A
+#ifdef CONFIG_VIDEO_UPD64031A_MODULE
         hw = ivtv_request_module(itv, hw, "upd64031a", IVTV_HW_UPD64031A);
 #endif
-#ifndef CONFIG_VIDEO_UPD64083
+#ifdef CONFIG_VIDEO_UPD64083_MODULE
         hw = ivtv_request_module(itv, hw, "upd64083", IVTV_HW_UPD6408X);
 #endif
-#ifndef CONFIG_VIDEO_MSP3400
+#ifdef CONFIG_VIDEO_MSP3400_MODULE
         hw = ivtv_request_module(itv, hw, "msp3400", IVTV_HW_MSP34XX);
 #endif
-#ifndef CONFIG_VIDEO_VP27SMPX
+#ifdef CONFIG_VIDEO_VP27SMPX_MODULE
         hw = ivtv_request_module(itv, hw, "vp27smpx", IVTV_HW_VP27SMPX);
 #endif
-#ifndef CONFIG_VIDEO_WM8775
+#ifdef CONFIG_VIDEO_WM8775_MODULE
         hw = ivtv_request_module(itv, hw, "wm8775", IVTV_HW_WM8775);
 #endif
-#ifndef CONFIG_VIDEO_WM8739
+#ifdef CONFIG_VIDEO_WM8739_MODULE
         hw = ivtv_request_module(itv, hw, "wm8739", IVTV_HW_WM8739);
 #endif
-#ifndef CONFIG_VIDEO_CS53L32A
+#ifdef CONFIG_VIDEO_CS53L32A_MODULE
         hw = ivtv_request_module(itv, hw, "cs53l32a", IVTV_HW_CS53L32A);
 #endif
-#ifndef CONFIG_VIDEO_M52790
+#ifdef CONFIG_VIDEO_M52790_MODULE
         hw = ivtv_request_module(itv, hw, "m52790", IVTV_HW_M52790);
 #endif
 #endif
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index adf2ba79496a..37860698f782 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -47,7 +47,7 @@ module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0-1)");
 
 #define SAA7110_MAX_INPUT       9       /* 6 CVBS, 3 SVHS */
-#define SAA7110_MAX_OUTPUT      0       /* its a decoder only */
+#define SAA7110_MAX_OUTPUT      1       /* 1 YUV */
 
 #define SAA7110_NR_REG          0x35
 
@@ -327,7 +327,7 @@ saa7110_command (struct i2c_client *client,
 
         case DECODER_SET_INPUT:
                 v = *(int *) arg;
-                if (v < 0 || v > SAA7110_MAX_INPUT) {
+                if (v < 0 || v >= SAA7110_MAX_INPUT) {
                         v4l_dbg(1, debug, client, "input=%d not available\n", v);
                         return -EINVAL;
                 }
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 249184452949..dfbe08a9ad9b 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -941,7 +941,8 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
                        dev->name,(unsigned long long)pci_resource_start(pci_dev,0));
                 goto fail1;
         }
-        dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000);
+        dev->lmmio = ioremap(pci_resource_start(pci_dev, 0),
+                             pci_resource_len(pci_dev, 0));
         dev->bmmio = (__u8 __iomem *)dev->lmmio;
         if (NULL == dev->lmmio) {
                 err = -EIO;
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index 28421d386f1e..c710bcd1df48 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -3695,7 +3695,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
         unsigned char video_ep = 0;
 
         if (debug >= 1)
-                dev_info(&uvd->dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);
+                dev_info(&dev->dev, "ibmcam_probe(%p,%u.)\n", intf, ifnum);
 
         /* We don't handle multi-config cameras */
         if (dev->descriptor.bNumConfigurations != 1)
@@ -3746,7 +3746,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         brand = "IBM PC Camera"; /* a.k.a. Xirlink C-It */
                         break;
                 }
-                dev_info(&uvd->dev->dev,
+                dev_info(&dev->dev,
                          "%s USB camera found (model %d, rev. 0x%04x)\n",
                          brand, model, le16_to_cpu(dev->descriptor.bcdDevice));
         } while (0);
@@ -3754,7 +3754,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
         /* Validate found interface: must have one ISO endpoint */
         nas = intf->num_altsetting;
         if (debug > 0)
-                dev_info(&uvd->dev->dev, "Number of alternate settings=%d.\n",
+                dev_info(&dev->dev, "Number of alternate settings=%d.\n",
                          nas);
         if (nas < 2) {
                 err("Too few alternate settings for this camera!");
@@ -3799,7 +3799,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                                 actInterface = i;
                                 maxPS = le16_to_cpu(endpoint->wMaxPacketSize);
                                 if (debug > 0)
-                                        dev_info(&uvd->dev->dev,
+                                        dev_info(&dev->dev,
                                                  "Active setting=%d. "
                                                  "maxPS=%d.\n", i, maxPS);
                         } else
@@ -3840,7 +3840,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         RESTRICT_TO_RANGE(framerate, 0, 5);
                         break;
                 default:
-                        dev_info(&uvd->dev->dev, "IBM camera: using 320x240\n");
+                        dev_info(&dev->dev, "IBM camera: using 320x240\n");
                         size = SIZE_320x240;
                         /* No break here */
                 case SIZE_320x240:
@@ -3869,7 +3869,7 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         canvasY = 120;
                         break;
                 default:
-                        dev_info(&uvd->dev->dev, "IBM NetCamera: using 176x144\n");
+                        dev_info(&dev->dev, "IBM NetCamera: using 176x144\n");
                         size = SIZE_176x144;
                         /* No break here */
                 case SIZE_176x144:
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index f5233f3d9eff..b89f476cd0a9 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -559,12 +559,6 @@ mptctl_fasync(int fd, struct file *filep, int mode)
         return ret;
 }
 
-static int
-mptctl_release(struct inode *inode, struct file *filep)
-{
-        return fasync_helper(-1, filep, 0, &async_queue);
-}
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *  MPT ioctl handler
@@ -2706,7 +2700,6 @@ mptctl_hp_targetinfo(unsigned long arg)
 static const struct file_operations mptctl_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
-        .release =      mptctl_release,
         .fasync =       mptctl_fasync,
         .unlocked_ioctl = mptctl_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index a1abf95cf751..603ffd008c73 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -77,12 +77,6 @@ MODULE_VERSION(my_VERSION);
  *  Fusion MPT LAN private structures
  */
 
-struct NAA_Hosed {
-        u16 NAA;
-        u8 ieee[FC_ALEN];
-        struct NAA_Hosed *next;
-};
-
 struct BufferControl {
         struct sk_buff  *skb;
         dma_addr_t      dma;
@@ -159,11 +153,6 @@ static u8 LanCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u32 max_buckets_out = 127;
 static u32 tx_max_out_p = 127 - 16;
 
-#ifdef QLOGIC_NAA_WORKAROUND
-static struct NAA_Hosed *mpt_bad_naa = NULL;
-DEFINE_RWLOCK(bad_naa_lock);
-#endif
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      lan_reply - Handle all data sent from the hardware.
@@ -780,30 +769,6 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
 //                      ctx, skb, skb->data));
 
         mac = skb_mac_header(skb);
-#ifdef QLOGIC_NAA_WORKAROUND
-{
-        struct NAA_Hosed *nh;
-
-        /* Munge the NAA for Tx packets to QLogic boards, which don't follow
-           RFC 2625. The longer I look at this, the more my opinion of Qlogic
-           drops. */
-        read_lock_irq(&bad_naa_lock);
-        for (nh = mpt_bad_naa; nh != NULL; nh=nh->next) {
-                if ((nh->ieee[0] == mac[0]) &&
-                    (nh->ieee[1] == mac[1]) &&
-                    (nh->ieee[2] == mac[2]) &&
-                    (nh->ieee[3] == mac[3]) &&
-                    (nh->ieee[4] == mac[4]) &&
-                    (nh->ieee[5] == mac[5])) {
-                        cur_naa = nh->NAA;
-                        dlprintk ((KERN_INFO "mptlan/sdu_send: using NAA value "
-                                  "= %04x.\n", cur_naa));
-                        break;
-                }
-        }
-        read_unlock_irq(&bad_naa_lock);
-}
-#endif
 
         pTrans->TransactionDetails[0] = cpu_to_le32((cur_naa         << 16) |
                                                     (mac[0] <<  8) |
@@ -1572,79 +1537,6 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
 
         fcllc = (struct fcllc *)skb->data;
 
-#ifdef QLOGIC_NAA_WORKAROUND
-{
-        u16 source_naa = fch->stype, found = 0;
-
-        /* Workaround for QLogic not following RFC 2625 in regards to the NAA
-           value. */
-
-        if ((source_naa & 0xF000) == 0)
-                source_naa = swab16(source_naa);
-
-        if (fcllc->ethertype == htons(ETH_P_ARP))
-            dlprintk ((KERN_INFO "mptlan/type_trans: got arp req/rep w/ naa of "
-                      "%04x.\n", source_naa));
-
-        if ((fcllc->ethertype == htons(ETH_P_ARP)) &&
-           ((source_naa >> 12) !=  MPT_LAN_NAA_RFC2625)){
-                struct NAA_Hosed *nh, *prevnh;
-                int i;
-
-                dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep from "
-                          "system with non-RFC 2625 NAA value (%04x).\n",
-                          source_naa));
-
-                write_lock_irq(&bad_naa_lock);
-                for (prevnh = nh = mpt_bad_naa; nh != NULL;
-                     prevnh=nh, nh=nh->next) {
-                        if ((nh->ieee[0] == fch->saddr[0]) &&
-                            (nh->ieee[1] == fch->saddr[1]) &&
-                            (nh->ieee[2] == fch->saddr[2]) &&
-                            (nh->ieee[3] == fch->saddr[3]) &&
-                            (nh->ieee[4] == fch->saddr[4]) &&
-                            (nh->ieee[5] == fch->saddr[5])) {
-                                found = 1;
-                                dlprintk ((KERN_INFO "mptlan/type_trans: ARP Re"
-                                         "q/Rep w/ bad NAA from system already"
-                                         " in DB.\n"));
-                                break;
-                        }
-                }
-
-                if ((!found) && (nh == NULL)) {
-
-                        nh = kmalloc(sizeof(struct NAA_Hosed), GFP_KERNEL);
-                        dlprintk ((KERN_INFO "mptlan/type_trans: ARP Req/Rep w/"
-                                 " bad NAA from system not yet in DB.\n"));
-
-                        if (nh != NULL) {
-                                nh->next = NULL;
-                                if (!mpt_bad_naa)
-                                        mpt_bad_naa = nh;
-                                if (prevnh)
-                                        prevnh->next = nh;
-
-                                nh->NAA = source_naa; /* Set the S_NAA value. */
-                                for (i = 0; i < FC_ALEN; i++)
-                                        nh->ieee[i] = fch->saddr[i];
-                                dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:"
-                                          "%02x:%02x with non-compliant S_NAA value.\n",
-                                          fch->saddr[0], fch->saddr[1], fch->saddr[2],
-                                          fch->saddr[3], fch->saddr[4],fch->saddr[5]));
-                        } else {
-                                printk (KERN_ERR "mptlan/type_trans: Unable to"
-                                        " kmalloc a NAA_Hosed struct.\n");
-                        }
-                } else if (!found) {
-                        printk (KERN_ERR "mptlan/type_trans: found not"
-                                " set, but nh isn't null. Evil "
-                                "funkiness abounds.\n");
-                }
-                write_unlock_irq(&bad_naa_lock);
-        }
-}
-#endif
 
         /* Strip the SNAP header from ARP packets since we don't
          * pass them through to the 802.2/SNAP layers.
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 11a617ab4243..84bdc2ee69e6 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -567,8 +567,8 @@ static void i2o_block_biosparam(unsigned long capacity, unsigned short *cyls,
 
 /**
  *      i2o_block_open - Open the block device
- *      @inode: inode for block device being opened
- *      @file: file to open
+ *      @bdev: block device being opened
+ *      @mode: file open mode
  *
  *      Power up the device, mount and lock the media. This function is called,
  *      if the block device is opened for access.
@@ -596,8 +596,8 @@ static int i2o_block_open(struct block_device *bdev, fmode_t mode)
 
 /**
  *      i2o_block_release - Release the I2O block device
- *      @inode: inode for block device being released
- *      @file: file to close
+ *      @disk: gendisk device being released
+ *      @mode: file open mode
  *
  *      Unlock and unmount the media, and power down the device. Gets called if
  *      the block device is closed.
@@ -643,8 +643,8 @@ static int i2o_block_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 
 /**
  *      i2o_block_ioctl - Issue device specific ioctl calls.
- *      @inode: inode for block device ioctl
- *      @file: file for ioctl
+ *      @bdev: block device being opened
+ *      @mode: file open mode
  *      @cmd: ioctl command
  *      @arg: arg
  *
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index a3fabdbe6ca6..f3384c32b9a1 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -1097,28 +1097,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
 static int cfg_release(struct inode *inode, struct file *file)
 {
         ulong id = (ulong) file->private_data;
-        struct i2o_cfg_info *p1, *p2;
+        struct i2o_cfg_info *p, **q;
         unsigned long flags;
 
         lock_kernel();
-        p1 = p2 = NULL;
-
         spin_lock_irqsave(&i2o_config_lock, flags);
-        for (p1 = open_files; p1;) {
-                if (p1->q_id == id) {
-
-                        if (p1->fasync)
-                                cfg_fasync(-1, file, 0);
-                        if (p2)
-                                p2->next = p1->next;
-                        else
-                                open_files = p1->next;
-
-                        kfree(p1);
+        for (q = &open_files; (p = *q) != NULL; q = &p->next) {
+                if (p->q_id == id) {
+                        *q = p->next;
+                        kfree(p);
                         break;
                 }
-                p2 = p1;
-                p1 = p1->next;
         }
         spin_unlock_irqrestore(&i2o_config_lock, flags);
         unlock_kernel();
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 5a79d2d4cdae..257277394f8c 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -81,7 +81,7 @@ config MFD_TMIO
 
 config MFD_T7L66XB
         bool "Support Toshiba T7L66XB"
-        depends on ARM
+        depends on ARM && HAVE_CLK
         select MFD_CORE
         select MFD_TMIO
         help
@@ -89,7 +89,7 @@ config MFD_T7L66XB
 
 config MFD_TC6387XB
         bool "Support Toshiba TC6387XB"
-        depends on ARM
+        depends on ARM && HAVE_CLK
         select MFD_CORE
         select MFD_TMIO
         help
@@ -103,8 +103,20 @@ config MFD_TC6393XB
         help
           Support for Toshiba Mobile IO Controller TC6393XB
 
+config PMIC_DA903X
+        bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"
+        depends on I2C=y
+        help
+          Say yes here to support for Dialog Semiconductor DA9030 (a.k.a
+          ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC
+          usually found on PXA processors-based platforms. This includes
+          the I2C driver and the core APIs _only_, you have to select
+          individual components like LCD backlight, voltage regulators,
+          LEDs and battery-charger under the corresponding menus.
+
 config MFD_WM8400
         tristate "Support Wolfson Microelectronics WM8400"
+        depends on I2C
         help
           Support for the Wolfson Microelecronics WM8400 PMIC and audio
           CODEC.  This driver adds provides common support for accessing
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 0acefe8aff87..9a5ad8af9116 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -30,3 +30,5 @@ ifeq ($(CONFIG_SA1100_ASSABET),y)
 obj-$(CONFIG_MCP_UCB1200)       += ucb1x00-assabet.o
 endif
 obj-$(CONFIG_UCB1400_CORE)      += ucb1400_core.o
+
+obj-$(CONFIG_PMIC_DA903X)       += da903x.o
\ No newline at end of file
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 08e26beefe64..ce39fa54949b 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -113,7 +113,6 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
         if (!hdpu_chassis_id)
                 printk(KERN_WARNING "sky_nexus: "
                        "Unable to create proc dir entry: sky_chassis_id\n");
-        }
 
         return 0;
 }
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/misc/panasonic-laptop.c
index a2cb598d8ab5..4a1bc64485d5 100644
--- a/drivers/misc/panasonic-laptop.c
+++ b/drivers/misc/panasonic-laptop.c
@@ -116,7 +116,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile
index 35ce28578075..4fc40d8e1bcc 100644
--- a/drivers/misc/sgi-xp/Makefile
+++ b/drivers/misc/sgi-xp/Makefile
@@ -5,14 +5,14 @@
 obj-$(CONFIG_SGI_XP)            += xp.o
 xp-y                            := xp_main.o
 xp-$(CONFIG_IA64_SGI_SN2)       += xp_sn2.o xp_nofault.o
-xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o xp_uv.o
+xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o
 xp-$(CONFIG_IA64_SGI_UV)        += xp_uv.o
 xp-$(CONFIG_X86_64)             += xp_uv.o
 
 obj-$(CONFIG_SGI_XP)            += xpc.o
 xpc-y                           := xpc_main.o xpc_channel.o xpc_partition.o
 xpc-$(CONFIG_IA64_SGI_SN2)      += xpc_sn2.o
-xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o xpc_uv.o
+xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o
 xpc-$(CONFIG_IA64_SGI_UV)       += xpc_uv.o
 xpc-$(CONFIG_X86_64)            += xpc_uv.o
 
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 859a5281c61b..ed1722e50049 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -19,7 +19,11 @@
 #include <asm/system.h>
 #include <asm/sn/arch.h>        /* defines is_shub1() and is_shub2() */
 #define is_shub()       ia64_platform_is("sn2")
+#ifdef CONFIG_IA64_SGI_UV
 #define is_uv()         ia64_platform_is("uv")
+#else
+#define is_uv()         0
+#endif
 #endif
 #ifdef CONFIG_X86_64
 #include <asm/genapic.h>
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index 46325fc84811..e8d5cfbd32c2 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -1104,7 +1104,7 @@ xpc_do_exit(enum xp_retval reason)
 
         if (is_shub())
                 xpc_exit_sn2();
-        else
+        else if (is_uv())
                 xpc_exit_uv();
 }
 
@@ -1363,7 +1363,7 @@ out_2:
 out_1:
         if (is_shub())
                 xpc_exit_sn2();
-        else
+        else if (is_uv())
                 xpc_exit_uv();
         return ret;
 }
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 5a97d3a9d745..06f07e19dc70 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1920,7 +1920,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)
 {
-        sonypi_misc_fasync(-1, file, 0);
         atomic_dec(&sonypi_compat.open_count);
         return 0;
 }
@@ -2315,8 +2314,10 @@ end:
  */
 static int sony_pic_disable(struct acpi_device *device)
 {
-        if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
-                        "_DIS", NULL, NULL)))
+        acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
+                                               NULL);
+
+        if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
                 return -ENXIO;
 
         dprintk("Device disabled\n");
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 0d9b2d6f9ebf..f210a8ee6861 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -216,8 +216,7 @@ int mmc_add_card(struct mmc_card *card)
         int ret;
         const char *type;
 
-        snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
-                 "%s:%04x", mmc_hostname(card->host), card->rca);
+        dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);
 
         switch (card->type) {
         case MMC_TYPE_MMC:
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 044d84eeed7c..f7284b905eb3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -280,7 +280,11 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)
                         (card->host->ios.clock / 1000);
 
                 if (data->flags & MMC_DATA_WRITE)
-                        limit_us = 250000;
+                        /*
+                         * The limit is really 250 ms, but that is
+                         * insufficient for some crappy cards.
+                         */
+                        limit_us = 300000;
                 else
                         limit_us = 100000;
 
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 6da80fd4d974..5e945e64ead7 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -73,8 +73,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
         if (err)
                 goto free;
 
-        snprintf(host->class_dev.bus_id, BUS_ID_SIZE,
-                 "mmc%d", host->index);
+        dev_set_name(&host->class_dev, "mmc%d", host->index);
 
         host->parent = dev;
         host->class_dev.parent = dev;
@@ -121,7 +120,7 @@ int mmc_add_host(struct mmc_host *host)
         WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
                 !host->ops->enable_sdio_irq);
 
-        led_trigger_register_simple(host->class_dev.bus_id, &host->led);
+        led_trigger_register_simple(dev_name(&host->class_dev), &host->led);
 
         err = device_add(&host->class_dev);
         if (err)
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 233d0f9b3c4b..46284b527397 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -239,8 +239,7 @@ int sdio_add_func(struct sdio_func *func)
 {
         int ret;
 
-        snprintf(func->dev.bus_id, sizeof(func->dev.bus_id),
-                 "%s:%d", mmc_card_id(func->card), func->num);
+        dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
 
         ret = device_add(&func->dev);
         if (ret == 0)
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 07faf5412a1f..ad00e1632317 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1348,7 +1348,7 @@ static int mmc_spi_probe(struct spi_device *spi)
                 goto fail_add_host;
 
         dev_info(&spi->dev, "SD/MMC host %s%s%s%s%s\n",
-                        mmc->class_dev.bus_id,
+                        dev_name(&mmc->class_dev),
                         host->dma_dev ? "" : ", no DMA",
                         (host->pdata && host->pdata->get_ro)
                                 ? "" : ", no WP",
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 696cf3647ceb..2fadf323c696 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -391,6 +391,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
 static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
         struct mmci_host *host = mmc_priv(mmc);
+        unsigned long flags;
 
         WARN_ON(host->mrq != NULL);
 
@@ -402,7 +403,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
                 return;
         }
 
-        spin_lock_irq(&host->lock);
+        spin_lock_irqsave(&host->lock, flags);
 
         host->mrq = mrq;
 
@@ -411,7 +412,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
         mmci_start_command(host, mrq->cmd, 0);
 
-        spin_unlock_irq(&host->lock);
+        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 30f64b1f2354..4d010a984bed 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1733,7 +1733,7 @@ int sdhci_add_host(struct sdhci_host *host)
         mmc_add_host(mmc);
 
         printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s%s\n",
-                mmc_hostname(mmc), host->hw_name, mmc_dev(mmc)->bus_id,
+                mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
                 (host->flags & SDHCI_USE_ADMA)?"A":"",
                 (host->flags & SDHCI_USE_DMA)?"DMA":"PIO");
 
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 13844843e8de..82554ddec6b3 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -632,7 +632,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
         if (host->req) {
                 printk(KERN_ERR "%s : unfinished request detected\n",
-                       sock->dev.bus_id);
+                       dev_name(&sock->dev));
                 mrq->cmd->error = -ETIMEDOUT;
                 goto err_out;
         }
@@ -672,7 +672,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                             ? PCI_DMA_TODEVICE
                                             : PCI_DMA_FROMDEVICE)) {
                                 printk(KERN_ERR "%s : scatterlist map failed\n",
-                                       sock->dev.bus_id);
+                                       dev_name(&sock->dev));
                                 mrq->cmd->error = -ENOMEM;
                                 goto err_out;
                         }
@@ -684,7 +684,7 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq)
                                                    : PCI_DMA_FROMDEVICE);
                         if (host->sg_len < 1) {
                                 printk(KERN_ERR "%s : scatterlist map failed\n",
-                                       sock->dev.bus_id);
+                                       dev_name(&sock->dev));
                                 tifm_unmap_sg(sock, &host->bounce_buf, 1,
                                               r_data->flags & MMC_DATA_WRITE
                                               ? PCI_DMA_TODEVICE
@@ -748,7 +748,7 @@ static void tifm_sd_end_cmd(unsigned long data)
 
         if (!mrq) {
                 printk(KERN_ERR " %s : no request to complete?\n",
-                       sock->dev.bus_id);
+                       dev_name(&sock->dev));
                 spin_unlock_irqrestore(&sock->lock, flags);
                 return;
         }
@@ -789,7 +789,7 @@ static void tifm_sd_abort(unsigned long data)
         printk(KERN_ERR
                "%s : card failed to respond for a long period of time "
                "(%x, %x)\n",
-               host->dev->dev.bus_id, host->req->cmd->opcode, host->cmd_flags);
+               dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags);
 
         tifm_eject(host->dev);
 }
@@ -906,7 +906,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
 
         if (rc) {
                 printk(KERN_ERR "%s : controller failed to reset\n",
-                       sock->dev.bus_id);
+                       dev_name(&sock->dev));
                 return -ENODEV;
         }
 
@@ -933,7 +933,7 @@ static int tifm_sd_initialize_host(struct tifm_sd *host)
         if (rc) {
                 printk(KERN_ERR
                        "%s : card not ready - probe failed on initialization\n",
-                       sock->dev.bus_id);
+                       dev_name(&sock->dev));
                 return -ENODEV;
         }
 
@@ -954,7 +954,7 @@ static int tifm_sd_probe(struct tifm_dev *sock)
         if (!(TIFM_SOCK_STATE_OCCUPIED
               & readl(sock->addr + SOCK_PRESENT_STATE))) {
                 printk(KERN_WARNING "%s : card gone, unexpectedly\n",
-                       sock->dev.bus_id);
+                       dev_name(&sock->dev));
                 return rc;
         }
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 3e6f5d8609e8..d74ec46aa032 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -406,19 +406,6 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
                 /* Set the default CFI lock/unlock addresses */
                 cfi->addr_unlock1 = 0x555;
                 cfi->addr_unlock2 = 0x2aa;
-                /* Modify the unlock address if we are in compatibility mode */
-                if (    /* x16 in x8 mode */
-                        ((cfi->device_type == CFI_DEVICETYPE_X8) &&
-                                (cfi->cfiq->InterfaceDesc ==
-                                        CFI_INTERFACE_X8_BY_X16_ASYNC)) ||
-                        /* x32 in x16 mode */
-                        ((cfi->device_type == CFI_DEVICETYPE_X16) &&
-                                (cfi->cfiq->InterfaceDesc ==
-                                        CFI_INTERFACE_X16_BY_X32_ASYNC)))
-                {
-                        cfi->addr_unlock1 = 0xaaa;
-                        cfi->addr_unlock2 = 0x555;
-                }
 
         } /* CFI mode */
         else if (cfi->cfi_mode == CFI_MODE_JEDEC) {
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index f84ab6182148..2f3f2f719ba4 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -1808,9 +1808,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, uint32_t base,
          * several first banks can contain 0x7f instead of actual ID
          */
         do {
-                uint32_t ofs = cfi_build_cmd_addr(0 + (bank << 8),
-                                                  cfi_interleave(cfi),
-                                                  cfi->device_type);
+                uint32_t ofs = cfi_build_cmd_addr(0 + (bank << 8), map, cfi);
                 mask = (1 << (cfi->device_type * 8)) - 1;
                 result = map_read(map, base + ofs);
                 bank++;
@@ -1824,7 +1822,7 @@ static inline u32 jedec_read_id(struct map_info *map, uint32_t base,
 {
         map_word result;
         unsigned long mask;
-        u32 ofs = cfi_build_cmd_addr(1, cfi_interleave(cfi), cfi->device_type);
+        u32 ofs = cfi_build_cmd_addr(1, map, cfi);
         mask = (1 << (cfi->device_type * 8)) -1;
         result = map_read(map, base + ofs);
         return result.x[0] & mask;
@@ -2067,8 +2065,8 @@ static int jedec_probe_chip(struct map_info *map, __u32 base,
 
         }
         /* Ensure the unlock addresses we try stay inside the map */
-        probe_offset1 = cfi_build_cmd_addr(cfi->addr_unlock1, cfi_interleave(cfi), cfi->device_type);
-        probe_offset2 = cfi_build_cmd_addr(cfi->addr_unlock2, cfi_interleave(cfi), cfi->device_type);
+        probe_offset1 = cfi_build_cmd_addr(cfi->addr_unlock1, map, cfi);
+        probe_offset2 = cfi_build_cmd_addr(cfi->addr_unlock2, map, cfi);
         if (    ((base + probe_offset1 + map_bankwidth(map)) >= map->size) ||
                 ((base + probe_offset2 + map_bankwidth(map)) >= map->size))
                 goto retry;
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 8387e05daae2..e39b21d3e168 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -38,7 +38,6 @@
 #include <asm/arch/gpmc.h>
 #include <asm/arch/onenand.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/gpmc.h>
 #include <asm/arch/pm.h>
 
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 3a7bc524af33..c7a4f3bcc2bc 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -94,7 +94,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
+static char version[] __devinitdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
 
 #ifdef EL3_DEBUG
 static int el3_debug = EL3_DEBUG;
@@ -186,7 +186,7 @@ static int max_interrupt_work = 10;
 static int nopnp;
 #endif
 
-static int __init el3_common_init(struct net_device *dev);
+static int __devinit el3_common_init(struct net_device *dev);
 static void el3_common_remove(struct net_device *dev);
 static ushort id_read_eeprom(int index);
 static ushort read_eeprom(int ioaddr, int index);
@@ -537,7 +537,7 @@ static struct mca_driver el3_mca_driver = {
 static int mca_registered;
 #endif /* CONFIG_MCA */
 
-static int __init el3_common_init(struct net_device *dev)
+static int __devinit el3_common_init(struct net_device *dev)
 {
         struct el3_private *lp = netdev_priv(dev);
         int err;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f749b40f954e..11f143f4adf6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2010,9 +2010,13 @@ config IGB_LRO
           If in doubt, say N.
 
 config IGB_DCA
-        bool "Enable DCA"
+        bool "Direct Cache Access (DCA) Support"
         default y
         depends on IGB && DCA && !(IGB=y && DCA=m)
+        ---help---
+          Say Y here if you want to use Direct Cache Access (DCA) in the
+          driver.  DCA is a method for warming the CPU cache before data
+          is used, with the intent of lessening the impact of cache misses.
 
 source "drivers/net/ixp2000/Kconfig"
 
@@ -2437,9 +2441,13 @@ config IXGBE
           will be called ixgbe.
 
 config IXGBE_DCA
-        bool
+        bool "Direct Cache Access (DCA) Support"
         default y
         depends on IXGBE && DCA && !(IXGBE=y && DCA=m)
+        ---help---
+          Say Y here if you want to use Direct Cache Access (DCA) in the
+          driver.  DCA is a method for warming the CPU cache before data
+          is used, with the intent of lessening the impact of cache misses.
 
 config IXGB
         tristate "Intel(R) PRO/10GbE support"
@@ -2489,9 +2497,13 @@ config MYRI10GE
           will be called myri10ge.
 
 config MYRI10GE_DCA
-        bool
+        bool "Direct Cache Access (DCA) Support"
         default y
         depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+        ---help---
+          Say Y here if you want to use Direct Cache Access (DCA) in the
+          driver.  DCA is a method for warming the CPU cache before data
+          is used, with the intent of lessening the impact of cache misses.
 
 config NETXEN_NIC
         tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index c54967f7942a..07a6697e3635 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -644,10 +644,6 @@ This function frees the  transmiter and receiver descriptor rings.
 */
 static void amd8111e_free_ring(struct amd8111e_priv* lp)
 {
-
-        /* Free transmit and receive skbs */
-        amd8111e_free_skbs(lp->amd8111e_net_dev);
-
         /* Free transmit and receive descriptor rings */
         if(lp->rx_ring){
                 pci_free_consistent(lp->pci_dev,
@@ -833,12 +829,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
 
         } while(intr0 & RINT0);
 
-        /* Receive descriptor is empty now */
-        spin_lock_irqsave(&lp->lock, flags);
-        __netif_rx_complete(dev, napi);
-        writel(VAL0|RINTEN0, mmio + INTEN0);
-        writel(VAL2 | RDMD0, mmio + CMD0);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        if (rx_pkt_limit > 0) {
+                /* Receive descriptor is empty now */
+                spin_lock_irqsave(&lp->lock, flags);
+                __netif_rx_complete(dev, napi);
+                writel(VAL0|RINTEN0, mmio + INTEN0);
+                writel(VAL2 | RDMD0, mmio + CMD0);
+                spin_unlock_irqrestore(&lp->lock, flags);
+        }
 
 rx_not_empty:
         return num_rx_pkt;
@@ -1231,7 +1229,9 @@ static int amd8111e_close(struct net_device * dev)
 
         amd8111e_disable_interrupt(lp);
         amd8111e_stop_chip(lp);
-        amd8111e_free_ring(lp);
+
+        /* Free transmit and receive skbs */
+        amd8111e_free_skbs(lp->amd8111e_net_dev);
 
         netif_carrier_off(lp->amd8111e_net_dev);
 
@@ -1241,6 +1241,7 @@ static int amd8111e_close(struct net_device * dev)
 
         spin_unlock_irq(&lp->lock);
         free_irq(dev->irq, dev);
+        amd8111e_free_ring(lp);
 
         /* Update the statistics before closing */
         amd8111e_get_stats(dev);
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 0fa53464efb2..6f431a887e7e 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -1080,7 +1080,8 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                 init_timer(&lp->check_timer);
                 lp->check_timer.data = (unsigned long)dev;
                 lp->check_timer.function = at91ether_check_link;
-        }
+        } else if (lp->board_data.phy_irq_pin >= 32)
+                gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
 
         /* Display ethernet banner */
         printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
@@ -1167,6 +1168,9 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(dev);
 
+        if (lp->board_data.phy_irq_pin >= 32)
+                gpio_free(lp->board_data.phy_irq_pin);
+
         unregister_netdev(dev);
         free_irq(dev->irq, dev);
         dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h
index b645fa0f3f64..c49550d507a0 100644
--- a/drivers/net/atl1e/atl1e.h
+++ b/drivers/net/atl1e/atl1e.h
@@ -46,7 +46,6 @@
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/tcp.h>
-#include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/workqueue.h>
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3cf59a7f5a1c..246d92b42636 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2310,7 +2310,8 @@ static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,
                 if (tpd != ptpd)
                         memcpy(tpd, ptpd, sizeof(struct tx_packet_desc));
                 tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tpd->word2 = (cpu_to_le16(buffer_info->length) &
+                tpd->word2 &= ~(TPD_BUFLEN_MASK << TPD_BUFLEN_SHIFT);
+                tpd->word2 |= (cpu_to_le16(buffer_info->length) &
                         TPD_BUFLEN_MASK) << TPD_BUFLEN_SHIFT;
 
                 /*
@@ -2409,8 +2410,8 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                 vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) |
                         ((vlan_tag >> 9) & 0x8);
                 ptpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT;
-                ptpd->word3 |= (vlan_tag & TPD_VL_TAGGED_MASK) <<
-                        TPD_VL_TAGGED_SHIFT;
+                ptpd->word2 |= (vlan_tag & TPD_VLANTAG_MASK) <<
+                        TPD_VLANTAG_SHIFT;
         }
 
         tso = atl1_tso(adapter, skb, ptpd);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index a5015b14a429..ffa73fc8d95e 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -504,7 +504,7 @@ struct rx_free_desc {
 #define TPD_PKTNT_MASK          0x0001
 #define TPD_PKTINT_SHIFT        15
 #define TPD_VLANTAG_MASK        0xFFFF
-#define TPD_VLAN_SHIFT          16
+#define TPD_VLANTAG_SHIFT       16
 
 /* tpd word 3 bits 0:13 */
 #define TPD_EOP_MASK            0x0001
diff --git a/drivers/net/bnx2x_init.h b/drivers/net/bnx2x_init.h
index 130927cfc75b..a6c0b3abba29 100644
--- a/drivers/net/bnx2x_init.h
+++ b/drivers/net/bnx2x_init.h
@@ -564,14 +564,15 @@ static const struct arb_line write_arb_addr[NUM_WR_Q-1] = {
 
 static void bnx2x_init_pxp(struct bnx2x *bp)
 {
+        u16 devctl;
         int r_order, w_order;
         u32 val, i;
 
         pci_read_config_word(bp->pdev,
-                             bp->pcie_cap + PCI_EXP_DEVCTL, (u16 *)&val);
-        DP(NETIF_MSG_HW, "read 0x%x from devctl\n", (u16)val);
-        w_order = ((val & PCI_EXP_DEVCTL_PAYLOAD) >> 5);
-        r_order = ((val & PCI_EXP_DEVCTL_READRQ) >> 12);
+                             bp->pcie_cap + PCI_EXP_DEVCTL, &devctl);
+        DP(NETIF_MSG_HW, "read 0x%x from devctl\n", devctl);
+        w_order = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5);
+        r_order = ((devctl & PCI_EXP_DEVCTL_READRQ) >> 12);
 
         if (r_order > MAX_RD_ORD) {
                 DP(NETIF_MSG_HW, "read order of %d  order adjusted to %d\n",
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index fce745148ff9..600210d7eff9 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -59,8 +59,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.45.22"
-#define DRV_MODULE_RELDATE      "2008/09/09"
+#define DRV_MODULE_VERSION      "1.45.23"
+#define DRV_MODULE_RELDATE      "2008/11/03"
 #define BNX2X_BC_VER            0x040200
 
 /* Time in jiffies before concluding the transmitter is hung */
@@ -6481,6 +6481,7 @@ load_int_disable:
         bnx2x_free_irq(bp);
 load_error:
         bnx2x_free_mem(bp);
+        bp->port.pmf = 0;
 
         /* TBD we really need to reset the chip
            if we want to recover from this */
@@ -6791,6 +6792,7 @@ unload_error:
         /* Report UNLOAD_DONE to MCP */
         if (!BP_NOMCP(bp))
                 bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+        bp->port.pmf = 0;
 
         /* Free SKBs, SGEs, TPA pool and driver internals */
         bnx2x_free_skbs(bp);
@@ -10204,8 +10206,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
                 return -ENOMEM;
         }
 
-        netif_carrier_off(dev);
-
         bp = netdev_priv(dev);
         bp->msglevel = debug;
 
@@ -10229,6 +10229,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
                 goto init_one_exit;
         }
 
+        netif_carrier_off(dev);
+
         bp->common.name = board_info[ent->driver_data].name;
         printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx,"
                " IRQ %d, ", dev->name, bp->common.name,
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index ade5f3f6693b..87437c788476 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -169,11 +169,14 @@ static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_
         /* clear slave from tx_hashtbl */
         tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;
 
-        index = SLAVE_TLB_INFO(slave).head;
-        while (index != TLB_NULL_INDEX) {
-                u32 next_index = tx_hash_table[index].next;
-                tlb_init_table_entry(&tx_hash_table[index], save_load);
-                index = next_index;
+        /* skip this if we've already freed the tx hash table */
+        if (tx_hash_table) {
+                index = SLAVE_TLB_INFO(slave).head;
+                while (index != TLB_NULL_INDEX) {
+                        u32 next_index = tx_hash_table[index].next;
+                        tlb_init_table_entry(&tx_hash_table[index], save_load);
+                        index = next_index;
+                }
         }
 
         tlb_init_slave(slave);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 832739f38db4..a3efba59eee9 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1979,6 +1979,20 @@ void bond_destroy(struct bonding *bond)
         unregister_netdevice(bond->dev);
 }
 
+static void bond_destructor(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+
+        if (bond->wq)
+                destroy_workqueue(bond->wq);
+
+        netif_addr_lock_bh(bond_dev);
+        bond_mc_list_destroy(bond);
+        netif_addr_unlock_bh(bond_dev);
+
+        free_netdev(bond_dev);
+}
+
 /*
 * First release a slave and than destroy the bond if no more slaves iare left.
 * Must be under rtnl_lock when this function is called.
@@ -2376,6 +2390,9 @@ static void bond_miimon_commit(struct bonding *bond)
                         continue;
 
                 case BOND_LINK_DOWN:
+                        if (slave->link_failure_count < UINT_MAX)
+                                slave->link_failure_count++;
+
                         slave->link = BOND_LINK_DOWN;
 
                         if (bond->params.mode == BOND_MODE_ACTIVEBACKUP ||
@@ -4550,7 +4567,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
 
         bond_set_mode_ops(bond, bond->params.mode);
 
-        bond_dev->destructor = free_netdev;
+        bond_dev->destructor = bond_destructor;
 
         /* Initialize the device options */
         bond_dev->tx_queue_len = 0;
@@ -4589,20 +4606,6 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
         return 0;
 }
 
-/* De-initialize device specific data.
- * Caller must hold rtnl_lock.
- */
-static void bond_deinit(struct net_device *bond_dev)
-{
-        struct bonding *bond = bond_dev->priv;
-
-        list_del(&bond->bond_list);
-
-#ifdef CONFIG_PROC_FS
-        bond_remove_proc_entry(bond);
-#endif
-}
-
 static void bond_work_cancel_all(struct bonding *bond)
 {
         write_lock_bh(&bond->lock);
@@ -4624,6 +4627,22 @@ static void bond_work_cancel_all(struct bonding *bond)
                 cancel_delayed_work(&bond->ad_work);
 }
 
+/* De-initialize device specific data.
+ * Caller must hold rtnl_lock.
+ */
+static void bond_deinit(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+
+        list_del(&bond->bond_list);
+
+        bond_work_cancel_all(bond);
+
+#ifdef CONFIG_PROC_FS
+        bond_remove_proc_entry(bond);
+#endif
+}
+
 /* Unregister and free all bond devices.
  * Caller must hold rtnl_lock.
  */
@@ -4635,9 +4654,6 @@ static void bond_free_all(void)
                 struct net_device *bond_dev = bond->dev;
 
                 bond_work_cancel_all(bond);
-                netif_addr_lock_bh(bond_dev);
-                bond_mc_list_destroy(bond);
-                netif_addr_unlock_bh(bond_dev);
                 /* Release the bonded slaves */
                 bond_release_all(bond_dev);
                 bond_destroy(bond);
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 65d0a9103297..7e8a63106bdf 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -32,14 +32,14 @@
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
 
-#include <asm/arch/svinto.h>/* DMA and register descriptions */
+#include <arch/svinto.h>/* DMA and register descriptions */
 #include <asm/io.h>         /* CRIS_LED_* I/O functions */
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/system.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 //#define ETHDEBUG
 #define D(x)
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 82dd1a891ce7..002d918fb4c7 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0094"
+#define DRV_VERSION     "EHEA_0095"
 
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 9b61dc9865d1..9d006878f045 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -632,10 +632,13 @@ static void ehea_rebuild_busmap(void)
         }
 }
 
-static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
+static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)
 {
         unsigned long i, start_section, end_section;
 
+        if (!nr_pages)
+                return 0;
+
         if (!ehea_bmap) {
                 ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
                 if (!ehea_bmap)
@@ -643,7 +646,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
         }
 
         start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
-        end_section = start_section + ((pgnum * PAGE_SIZE) / EHEA_SECTSIZE);
+        end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
         /* Mark entries as valid or invalid only; address is assigned later */
         for (i = start_section; i < end_section; i++) {
                 u64 flag;
@@ -692,10 +695,54 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages)
         return ret;
 }
 
-static int ehea_create_busmap_callback(unsigned long pfn,
-                                       unsigned long nr_pages, void *arg)
+static int ehea_is_hugepage(unsigned long pfn)
+{
+        int page_order;
+
+        if (pfn & EHEA_HUGEPAGE_PFN_MASK)
+                return 0;
+
+        page_order = compound_order(pfn_to_page(pfn));
+        if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT)
+                return 0;
+
+        return 1;
+}
+
+static int ehea_create_busmap_callback(unsigned long initial_pfn,
+                                       unsigned long total_nr_pages, void *arg)
 {
-        return ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
+        int ret;
+        unsigned long pfn, start_pfn, end_pfn, nr_pages;
+
+        if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)
+                return ehea_update_busmap(initial_pfn, total_nr_pages,
+                                          EHEA_BUSMAP_ADD_SECT);
+
+        /* Given chunk is >= 16GB -> check for hugepages */
+        start_pfn = initial_pfn;
+        end_pfn = initial_pfn + total_nr_pages;
+        pfn = start_pfn;
+
+        while (pfn < end_pfn) {
+                if (ehea_is_hugepage(pfn)) {
+                        /* Add mem found in front of the hugepage */
+                        nr_pages = pfn - start_pfn;
+                        ret = ehea_update_busmap(start_pfn, nr_pages,
+                                                 EHEA_BUSMAP_ADD_SECT);
+                        if (ret)
+                                return ret;
+
+                        /* Skip the hugepage */
+                        pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);
+                        start_pfn = pfn;
+                } else
+                        pfn += (EHEA_SECTSIZE / PAGE_SIZE);
+        }
+
+        /* Add mem found behind the hugepage(s)  */
+        nr_pages = pfn - start_pfn;
+        return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
 }
 
 int ehea_create_busmap(void)
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 1e58dc06b7d2..0817c1e74a19 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -40,6 +40,9 @@
 #define EHEA_PAGESIZE          (1UL << EHEA_PAGESHIFT)
 #define EHEA_SECTSIZE          (1UL << 24)
 #define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
+#define EHEA_HUGEPAGESHIFT     34
+#define EHEA_HUGEPAGE_SIZE     (1UL << EHEA_HUGEPAGESHIFT)
+#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)
 
 #if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
 #error eHEA module cannot work if kernel sectionsize < ehea sectionsize
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index cb51c1fb0338..a6f49d025787 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1099,7 +1099,9 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         ndev->stop = fs_enet_close;
         ndev->get_stats = fs_enet_get_stats;
         ndev->set_multicast_list = fs_set_multicast_list;
-
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        ndev->poll_controller = fs_enet_netpoll;
+#endif
         if (fpi->use_napi)
                 netif_napi_add(ndev, &fep->napi, fs_enet_rx_napi,
                                fpi->napi_weight);
@@ -1209,7 +1211,7 @@ static void __exit fs_cleanup(void)
 static void fs_enet_netpoll(struct net_device *dev)
 {
        disable_irq(dev->irq);
-       fs_enet_interrupt(dev->irq, dev, NULL);
+       fs_enet_interrupt(dev->irq, dev);
        enable_irq(dev->irq);
 }
 #endif
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 64b201134fdb..83a5cb6aa23b 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -586,6 +586,18 @@ static void gfar_configure_serdes(struct net_device *dev)
         struct gfar_mii __iomem *regs =
                         (void __iomem *)&priv->regs->gfar_mii_regs;
         int tbipa = gfar_read(&priv->regs->tbipa);
+        struct mii_bus *bus = gfar_get_miibus(priv);
+
+        if (bus)
+                mutex_lock(&bus->mdio_lock);
+
+        /* If the link is already up, we must already be ok, and don't need to
+         * configure and reset the TBI<->SerDes link.  Maybe U-Boot configured
+         * everything for us?  Resetting it takes the link down and requires
+         * several seconds for it to come back.
+         */
+        if (gfar_local_mdio_read(regs, tbipa, MII_BMSR) & BMSR_LSTATUS)
+                goto done;
 
         /* Single clk mode, mii mode off(for serdes communication) */
         gfar_local_mdio_write(regs, tbipa, MII_TBICON, TBICON_CLK_SELECT);
@@ -596,6 +608,10 @@ static void gfar_configure_serdes(struct net_device *dev)
 
         gfar_local_mdio_write(regs, tbipa, MII_BMCR, BMCR_ANENABLE |
                         BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+
+        done:
+        if (bus)
+                mutex_unlock(&bus->mdio_lock);
 }
 
 static void init_registers(struct net_device *dev)
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index bf73eea98010..0e2595d24933 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -269,6 +269,27 @@ static struct device_driver gianfar_mdio_driver = {
         .remove = gfar_mdio_remove,
 };
 
+static int match_mdio_bus(struct device *dev, void *data)
+{
+        const struct gfar_private *priv = data;
+        const struct platform_device *pdev = to_platform_device(dev);
+
+        return !strcmp(pdev->name, gianfar_mdio_driver.name) &&
+                pdev->id == priv->einfo->mdio_bus;
+}
+
+/* Given a gfar_priv structure, find the mii_bus controlled by this device (not
+ * necessarily the same as the bus the gfar's PHY is on), if one exists.
+ * Normally only the first gianfar controls a mii_bus.  */
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv)
+{
+        /*const*/ struct device *d;
+
+        d = bus_find_device(gianfar_mdio_driver.bus, NULL, (void *)priv,
+                            match_mdio_bus);
+        return d ? dev_get_drvdata(d) : NULL;
+}
+
 int __init gfar_mdio_init(void)
 {
         return driver_register(&gianfar_mdio_driver);
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h
index 2af28b16a0e2..02dc970ca1ff 100644
--- a/drivers/net/gianfar_mii.h
+++ b/drivers/net/gianfar_mii.h
@@ -18,6 +18,8 @@
 #ifndef __GIANFAR_MII_H
 #define __GIANFAR_MII_H
 
+struct gfar_private; /* forward ref */
+
 #define MIIMIND_BUSY            0x00000001
 #define MIIMIND_NOTVALID        0x00000004
 
@@ -44,6 +46,7 @@ int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
 int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,
                           int regnum, u16 value);
 int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv);
 int __init gfar_mdio_init(void);
 void gfar_mdio_exit(void);
 #endif /* GIANFAR_PHY_H */
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2ee2622258f5..901212aa37cb 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2605,7 +2605,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                     of_device_is_compatible(np, "ibm,emac-440gr"))
                         dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
                 if (of_device_is_compatible(np, "ibm,emac-405ez")) {
-#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
                         dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
 #else
                         printk(KERN_ERR "%s: Flow control not disabled!\n",
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 2482d61662a2..2e67ae015d91 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -118,7 +118,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 1e0de93fd618..3843b5faba8b 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -82,7 +82,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 3b43bfd85a0f..b1ac63ab8c16 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -76,15 +76,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 
         skb->protocol = eth_type_trans(skb,dev);
 
-#ifdef LOOPBACK_TSO
-        if (skb_is_gso(skb)) {
-                BUG_ON(skb->protocol != htons(ETH_P_IP));
-                BUG_ON(ip_hdr(skb)->protocol != IPPROTO_TCP);
-
-                emulate_large_send_offload(skb);
-                return 0;
-        }
-#endif
         dev->last_rx = jiffies;
 
         /* it's OK to use per_cpu_ptr() because BHs are off */
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1b0eebf84f76..4b9794e97a79 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -35,7 +35,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
-#include <linux/cpumask.h>
 
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index a339afbeed38..a3f732418c49 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -706,7 +706,7 @@ tx_err:
         mlx4_en_release_rss_steer(priv);
 rx_err:
         for (i = 0; i < priv->rx_ring_num; i++)
-                mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[rx_index]);
+                mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);
 cq_err:
         while (rx_index--)
                 mlx4_en_deactivate_cq(priv, &priv->rx_cq[rx_index]);
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index be09fdb79cb8..cee199ceba2f 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -360,9 +360,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_PORT_ETH_MTU_OFFSET               0x02
 #define QUERY_PORT_WIDTH_OFFSET                 0x06
 #define QUERY_PORT_MAX_GID_PKEY_OFFSET          0x07
-#define QUERY_PORT_MAC_OFFSET                   0x08
 #define QUERY_PORT_MAX_MACVLAN_OFFSET           0x0a
 #define QUERY_PORT_MAX_VL_OFFSET                0x0b
+#define QUERY_PORT_MAC_OFFSET                   0x10
 
                 for (i = 1; i <= dev_cap->num_ports; ++i) {
                         err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a9c8c08044b1..b9dcdbd369f8 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1066,9 +1066,12 @@ static int smi_wait_ready(struct mv643xx_eth_shared_private *msp)
                 return 0;
         }
 
-        if (!wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
-                                msecs_to_jiffies(100)))
-                return -ETIMEDOUT;
+        if (!smi_is_done(msp)) {
+                wait_event_timeout(msp->smi_busy_wait, smi_is_done(msp),
+                                   msecs_to_jiffies(100));
+                if (!smi_is_done(msp))
+                        return -ETIMEDOUT;
+        }
 
         return 0;
 }
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index b1556b2e404c..a5f428bcc0eb 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
 
-#define MYRI10GE_VERSION_STR "1.4.3-1.371"
+#define MYRI10GE_VERSION_STR "1.4.3-1.375"
 
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1393,6 +1393,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
                 if (tx->req == tx->done) {
                         tx->queue_active = 0;
                         put_be32(htonl(1), tx->send_stop);
+                        mmiowb();
                 }
                 __netif_tx_unlock(dev_queue);
         }
@@ -2864,6 +2865,7 @@ again:
         if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) {
                 tx->queue_active = 1;
                 put_be32(htonl(1), tx->send_go);
+                mmiowb();
         }
         tx->pkt_start++;
         if ((avail - count) < MXGEFW_MAX_SEND_DESC) {
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index ebc812702903..9acb5d70a3ae 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -8667,7 +8667,6 @@ static void __devinit niu_device_announce(struct niu *np)
 static int __devinit niu_pci_init_one(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
-        unsigned long niureg_base, niureg_len;
         union niu_parent_id parent_id;
         struct net_device *dev;
         struct niu *np;
@@ -8758,10 +8757,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
 
         dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM);
 
-        niureg_base = pci_resource_start(pdev, 0);
-        niureg_len = pci_resource_len(pdev, 0);
-
-        np->regs = ioremap_nocache(niureg_base, niureg_len);
+        np->regs = pci_ioremap_bar(pdev, 0);
         if (!np->regs) {
                 dev_err(&pdev->dev, PFX "Cannot map device registers, "
                         "aborting.\n");
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index fc6f4b8c64b3..b646e92134dc 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -399,11 +399,11 @@ static int pppoe_rcv(struct sk_buff *skb,
         if (skb->len < len)
                 goto drop;
 
-        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
-        if (!po)
+        if (pskb_trim_rcsum(skb, len))
                 goto drop;
 
-        if (pskb_trim_rcsum(skb, len))
+        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
+        if (!po)
                 goto drop;
 
         return sk_receive_skb(sk_pppox(po), skb, 0);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index fa98af58223e..cd0d0873d978 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -174,8 +174,8 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {
 
 /* EEPROM range with gPXE configuration */
 #define EFX_ETHTOOL_EEPROM_MAGIC 0xEFAB
-#define EFX_ETHTOOL_EEPROM_MIN 0x100U
-#define EFX_ETHTOOL_EEPROM_MAX 0x400U
+#define EFX_ETHTOOL_EEPROM_MIN 0x800U
+#define EFX_ETHTOOL_EEPROM_MAX 0x1800U
 
 /**************************************************************************
  *
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index f59c7772f344..5051554ff05b 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -499,7 +499,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)
 #else
         SMC_PUSH_DATA(lp, buf, len);
         dev->trans_start = jiffies;
-        dev_kfree_skb(skb);
+        dev_kfree_skb_irq(skb);
 #endif
         if (!lp->tx_throttle) {
                 netif_wake_queue(dev);
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index c70870e0fd61..fc80f250da31 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2060,7 +2060,7 @@ static int smc_request_attrib(struct platform_device *pdev,
                               struct net_device *ndev)
 {
         struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
+        struct smc_local *lp __maybe_unused = netdev_priv(ndev);
 
         if (!res)
                 return 0;
@@ -2075,7 +2075,7 @@ static void smc_release_attrib(struct platform_device *pdev,
                                struct net_device *ndev)
 {
         struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
+        struct smc_local *lp __maybe_unused = netdev_priv(ndev);
 
         if (res)
                 release_mem_region(res->start, ATTRIB_SIZE);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 8e46a513a252..c91852f49a48 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -420,9 +420,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         /* Allocate Tx/Rx descriptor memory */
         db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
                         DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
+        if (!db->desc_pool_ptr)
+                goto err_out_res;
 
         db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
                         TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
+        if (!db->buf_pool_ptr)
+                goto err_out_free_desc;
 
         db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
         db->first_tx_desc_dma = db->desc_pool_dma_ptr;
@@ -469,7 +473,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
 
         err = register_netdev (dev);
         if (err)
-                goto err_out_res;
+                goto err_out_free_buf;
 
         printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
                "%s, irq %d.\n",
@@ -483,6 +487,12 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
 
         return 0;
 
+err_out_free_buf:
+        pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                            db->buf_pool_ptr, db->buf_pool_dma_ptr);
+err_out_free_desc:
+        pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
+                            db->desc_pool_ptr, db->desc_pool_dma_ptr);
 err_out_res:
         pci_release_regions(pdev);
 err_out_disable:
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6daea0c91862..33b6d1b122fb 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1070,8 +1070,6 @@ static int tun_chr_close(struct inode *inode, struct file *file)
 
         DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name);
 
-        tun_chr_fasync(-1, file, 0);
-
         rtnl_lock();
 
         /* Detach from net device */
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c
index cfbbfee55836..85f38a6b6a49 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
@@ -37,7 +37,6 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/types.h>
-#include <asm/uaccess.h>
 
 #include "ucc_geth.h"
 #include "ucc_geth_mii.h"
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 78df2be8a728..db3377dae9d5 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -396,6 +396,20 @@ static void dm9601_set_multicast(struct net_device *net)
         dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
 }
 
+static int dm9601_set_mac_address(struct net_device *net, void *p)
+{
+        struct sockaddr *addr = p;
+        struct usbnet *dev = netdev_priv(net);
+
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+
+        memcpy(net->dev_addr, addr->sa_data, net->addr_len);
+        dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
+
+        return 0;
+}
+
 static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 {
         int ret;
@@ -406,6 +420,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 
         dev->net->do_ioctl = dm9601_ioctl;
         dev->net->set_multicast_list = dm9601_set_multicast;
+        dev->net->set_mac_address = dm9601_set_mac_address;
         dev->net->ethtool_ops = &dm9601_ethtool_ops;
         dev->net->hard_header_len += DM_TX_OVERHEAD;
         dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 1164c52e2c0a..8e90891f0e42 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2184,19 +2184,20 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
                              struct usb_interface *interface)
 {
         struct hso_net *hso_net = dev2net(hso_dev);
-        struct device *dev = hso_dev->dev;
+        struct device *dev = &hso_net->net->dev;
         char *rfkn;
 
         hso_net->rfkill = rfkill_allocate(&interface_to_usbdev(interface)->dev,
-                                 RFKILL_TYPE_WLAN);
+                                 RFKILL_TYPE_WWAN);
         if (!hso_net->rfkill) {
-                dev_err(dev, "%s - Out of memory", __func__);
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 return;
         }
         rfkn = kzalloc(20, GFP_KERNEL);
         if (!rfkn) {
                 rfkill_free(hso_net->rfkill);
-                dev_err(dev, "%s - Out of memory", __func__);
+                hso_net->rfkill = NULL;
+                dev_err(dev, "%s - Out of memory\n", __func__);
                 return;
         }
         snprintf(rfkn, 20, "hso-%d",
@@ -2209,7 +2210,8 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
                 kfree(rfkn);
                 hso_net->rfkill->name = NULL;
                 rfkill_free(hso_net->rfkill);
-                dev_err(dev, "%s - Failed to register rfkill", __func__);
+                hso_net->rfkill = NULL;
+                dev_err(dev, "%s - Failed to register rfkill\n", __func__);
                 return;
         }
 }
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2dced383bcfb..3590ea5a902d 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -521,7 +521,7 @@ static void __devexit velocity_remove1(struct pci_dev *pdev)
  *      we don't duplicate code for each option.
  */
 
-static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, char *devname)
+static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, const char *devname)
 {
         if (val == -1)
                 *opt = def;
@@ -550,7 +550,7 @@ static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max,
  *      we don't duplicate code for each option.
  */
 
-static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, char *devname)
+static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, const char *devname)
 {
         (*opt) &= (~flag);
         if (val == -1)
@@ -576,7 +576,7 @@ static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 fla
  *      for the current device
  */
 
-static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname)
+static void __devinit velocity_get_options(struct velocity_opt *opts, int index, const char *devname)
 {
 
         velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
@@ -863,6 +863,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
         static int first = 1;
         struct net_device *dev;
         int i;
+        const char *drv_string;
         const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
         struct velocity_info *vptr;
         struct mac_regs __iomem * regs;
@@ -935,7 +936,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
                 dev->dev_addr[i] = readb(&regs->PAR[i]);
 
 
-        velocity_get_options(&vptr->options, velocity_nics, dev->name);
+        drv_string = dev_driver_string(&pdev->dev);
+
+        velocity_get_options(&vptr->options, velocity_nics, drv_string);
 
         /*
          *      Mask out the options cannot be set to the chip
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 327d58589e12..6e92f7b44b1a 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -756,10 +756,11 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
         case CISCO_ADDR_REQ:
                 /* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */
                 {
-                struct in_device *in_dev;
-                struct in_ifaddr *ifa;
                 __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
+                struct in_device *in_dev;
+                struct in_ifaddr *ifa;
+
                 rcu_read_lock();
                 if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
                 {
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index ccd9cd35ecbe..5bf7e01ef0e9 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -695,7 +695,6 @@ EXPORT_SYMBOL(z8530_nop);
  *      z8530_interrupt - Handle an interrupt from a Z8530
  *      @irq:   Interrupt number
  *      @dev_id: The Z8530 device that is interrupting.
- *      @regs: unused
  *
  *      A Z85[2]30 device has stuck its hand in the air for attention.
  *      We scan both the channels on the chip for events and then call
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 0f1d6bdd51a2..cfd4d052d666 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -661,8 +661,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct ath5k_softc *sc = hw->priv;
-        struct ath5k_hw *ah = sc->ah;
-        int i, err;
+        int err;
 
         pci_restore_state(pdev);
 
@@ -688,16 +687,6 @@ ath5k_pci_resume(struct pci_dev *pdev)
                 goto err_irq;
         ath5k_led_enable(sc);
 
-        /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up or resume.
-         *
-         * FIXME: This may need to be revisited when mac80211 becomes
-         *        aware of suspend/resume.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
-
         return 0;
 err_irq:
         free_irq(pdev->irq, sc);
@@ -718,7 +707,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
         struct ath5k_softc *sc = hw->priv;
         struct ath5k_hw *ah = sc->ah;
         u8 mac[ETH_ALEN];
-        unsigned int i;
         int ret;
 
         ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
@@ -737,13 +725,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
                 __set_bit(ATH_STAT_MRRETRY, sc->status);
 
         /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
-
-        /*
          * Collect the channel list.  The 802.11 layer
          * is resposible for filtering this list based
          * on settings like the phy mode and regulatory
@@ -2202,7 +2183,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 static int
 ath5k_init(struct ath5k_softc *sc, bool is_resume)
 {
-        int ret;
+        struct ath5k_hw *ah = sc->ah;
+        int ret, i;
 
         mutex_lock(&sc->lock);
 
@@ -2235,10 +2217,17 @@ ath5k_init(struct ath5k_softc *sc, bool is_resume)
         if (ret)
                 goto done;
 
+        /*
+         * Reset the key cache since some parts do not reset the
+         * contents on initial power up or resume from suspend.
+         */
+        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
+                ath5k_hw_reset_key(ah, i);
+
         __set_bit(ATH_STAT_STARTED, sc->status);
 
         /* Set ack to be sent at low bit-rates */
-        ath5k_hw_set_ack_bitrate_high(sc->ah, false);
+        ath5k_hw_set_ack_bitrate_high(ah, false);
 
         mod_timer(&sc->calib_tim, round_jiffies(jiffies +
                         msecs_to_jiffies(ath5k_calinterval * 1000)));
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
index 8f92d670f614..19980cbd5d5f 100644
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -339,7 +339,7 @@ static struct {
         { ATH5K_DEBUG_BEACON,   "beacon",       "beacon handling" },
         { ATH5K_DEBUG_CALIBRATE, "calib",       "periodic calibration" },
         { ATH5K_DEBUG_TXPOWER,  "txpower",      "transmit power setting" },
-        { ATH5K_DEBUG_LED,      "led",          "LED mamagement" },
+        { ATH5K_DEBUG_LED,      "led",          "LED management" },
         { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
         { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
         { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
diff --git a/drivers/net/wireless/ath5k/desc.c b/drivers/net/wireless/ath5k/desc.c
index dd1374052ba9..5e362a7a3620 100644
--- a/drivers/net/wireless/ath5k/desc.c
+++ b/drivers/net/wireless/ath5k/desc.c
@@ -531,10 +531,10 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL);
         rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
                 AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE);
-        rs->rs_antenna = rx_status->rx_status_0 &
-                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA;
-        rs->rs_more = rx_status->rx_status_0 &
-                AR5K_5210_RX_DESC_STATUS0_MORE;
+        rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA);
+        rs->rs_more = !!(rx_status->rx_status_0 &
+                AR5K_5210_RX_DESC_STATUS0_MORE);
         /* TODO: this timestamp is 13 bit, later on we assume 15 bit */
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
@@ -607,10 +607,10 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
                 AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL);
         rs->rs_rate = AR5K_REG_MS(rx_status->rx_status_0,
                 AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE);
-        rs->rs_antenna = rx_status->rx_status_0 &
-                AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA;
-        rs->rs_more = rx_status->rx_status_0 &
-                AR5K_5212_RX_DESC_STATUS0_MORE;
+        rs->rs_antenna = AR5K_REG_MS(rx_status->rx_status_0,
+                AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA);
+        rs->rs_more = !!(rx_status->rx_status_0 &
+                AR5K_5212_RX_DESC_STATUS0_MORE);
         rs->rs_tstamp = AR5K_REG_MS(rx_status->rx_status_1,
                 AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP);
         rs->rs_status = 0;
diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c
index ea2e1a20b499..ceaa6c475c06 100644
--- a/drivers/net/wireless/ath5k/initvals.c
+++ b/drivers/net/wireless/ath5k/initvals.c
@@ -806,6 +806,8 @@ static const struct ath5k_ini_mode ar5212_rf5111_ini_mode_end[] = {
                 { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
         { AR5K_PHY(642),
                 { 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+        { 0xa228,
+                { 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5 } },
         { 0xa23c,
                 { 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af } },
 };
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index 8f1886834e61..1b6d45b6772d 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -537,9 +537,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                 mdelay(1);
 
                 /*
-                 * Write some more initial register settings
+                 * Write some more initial register settings for revised chips
                  */
-                if (ah->ah_version == AR5K_AR5212) {
+                if (ah->ah_version == AR5K_AR5212 &&
+                    ah->ah_phy_revision > 0x41) {
                         ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);
 
                         if (channel->hw_value == CHANNEL_G)
@@ -558,19 +559,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                         else
                                 ath5k_hw_reg_write(ah, 0x00000000, 0x994c);
 
-                        /* Some bits are disabled here, we know nothing about
-                         * register 0xa228 yet, most of the times this ends up
-                         * with a value 0x9b5 -haven't seen any dump with
-                         * a different value- */
-                        /* Got this from decompiling binary HAL */
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffffdff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffe03ff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-                        data = 0;
+                        /* Got this from legacy-hal */
+                        AR5K_REG_DISABLE_BITS(ah, 0xa228, 0x200);
+
+                        AR5K_REG_MASKED_BITS(ah, 0xa228, 0x800, 0xfffe03ff);
 
                         /* Just write 0x9b5 ? */
                         /* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 24a1aeb6448f..8d690a0eb1a9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2090,7 +2090,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
                 iwl4965_error_recovery(priv);
 
         iwl_power_update_mode(priv, 1);
-        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 
         if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
                 iwl4965_set_mode(priv, priv->iw_mode);
@@ -2342,6 +2341,7 @@ static void iwl_bg_alive_start(struct work_struct *data)
         mutex_lock(&priv->mutex);
         iwl_alive_start(priv);
         mutex_unlock(&priv->mutex);
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 
 static void iwl4965_bg_rf_kill(struct work_struct *work)
@@ -3252,7 +3252,11 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
                 return;
         }
 
-        iwl_scan_cancel_timeout(priv, 100);
+        if (iwl_scan_cancel(priv)) {
+                /* cancel scan failed, just live w/ bad key and rely
+                   briefly on SW decryption */
+                return;
+        }
 
         key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);
         key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 3b0bee331a33..c89365e2ca58 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -896,6 +896,13 @@ static void iwl_bg_request_scan(struct work_struct *data)
         return;
 
  done:
+        /* Cannot perform scan. Make sure we clear scanning
+        * bits from status so next scan request can be performed.
+        * If we don't clear scanning status bit here all next scan
+        * will fail
+        */
+        clear_bit(STATUS_SCAN_HW, &priv->status);
+        clear_bit(STATUS_SCANNING, &priv->status);
         /* inform mac80211 scan aborted */
         queue_work(priv->workqueue, &priv->scan_completed);
         mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d15a2c997954..285b53e7e261 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5768,7 +5768,6 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
         if (priv->error_recovering)
                 iwl3945_error_recovery(priv);
 
-        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
         return;
 
  restart:
@@ -6013,6 +6012,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
         mutex_lock(&priv->mutex);
         iwl3945_alive_start(priv);
         mutex_unlock(&priv->mutex);
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 
 static void iwl3945_bg_rf_kill(struct work_struct *work)
@@ -6256,6 +6256,11 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
                                               n_probes,
                         (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]);
 
+        if (scan->channel_count == 0) {
+                IWL_DEBUG_SCAN("channel count %d\n", scan->channel_count);
+                goto done;
+        }
+
         cmd.len += le16_to_cpu(scan->tx_cmd.len) +
             scan->channel_count * sizeof(struct iwl3945_scan_channel);
         cmd.data = scan;
@@ -6273,6 +6278,14 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
         return;
 
  done:
+        /* can not perform scan make sure we clear scanning
+         * bits from status so next scan request can be performed.
+         * if we dont clear scanning status bit here all next scan
+         * will fail
+        */
+        clear_bit(STATUS_SCAN_HW, &priv->status);
+        clear_bit(STATUS_SCANNING, &priv->status);
+
         /* inform mac80211 scan aborted */
         queue_work(priv->workqueue, &priv->scan_completed);
         mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 297696de2da0..8265c7d25edc 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -605,9 +605,9 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,
         if (ret == 0) {
                 *curlevel = le16_to_cpu(cmd.curlevel);
                 if (minlevel)
-                        *minlevel = le16_to_cpu(cmd.minlevel);
+                        *minlevel = cmd.minlevel;
                 if (maxlevel)
-                        *maxlevel = le16_to_cpu(cmd.maxlevel);
+                        *maxlevel = cmd.maxlevel;
         }
 
         lbs_deb_leave(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5749f22b296f..079e6aa874dc 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -328,7 +328,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
                 lbs_deb_rx("rx err: frame received with bad length\n");
                 priv->stats.rx_length_errors++;
                 ret = -EINVAL;
-                kfree(skb);
+                kfree_skb(skb);
                 goto done;
         }
 
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 8f66903641b9..22c4c6110521 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -598,8 +598,8 @@ static int lbs_process_bss(struct bss_descriptor *bss,
 
                 switch (elem->id) {
                 case MFIE_TYPE_SSID:
-                        bss->ssid_len = elem->len;
-                        memcpy(bss->ssid, elem->data, elem->len);
+                        bss->ssid_len = min_t(int, 32, elem->len);
+                        memcpy(bss->ssid, elem->data, bss->ssid_len);
                         lbs_deb_scan("got SSID IE: '%s', len %u\n",
                                      escape_essid(bss->ssid, bss->ssid_len),
                                      bss->ssid_len);
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 2d022f83774c..827ca0384a4c 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -319,7 +319,7 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         void *tmp;
         int err;
         u8 *end = (u8 *)eeprom + len;
-        u16 synth;
+        u16 synth = 0;
         DECLARE_MAC_BUF(mac);
 
         wrap = (struct eeprom_pda_wrap *) eeprom;
@@ -422,7 +422,8 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                 entry = (void *)entry + (entry_len + 1)*2;
         }
 
-        if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) {
+        if (!synth || !priv->iq_autocal || !priv->output_limit ||
+            !priv->curve_data) {
                 printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
                 err = -EINVAL;
                 goto err;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1c2a02a741af..88b3cad8b65e 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -346,68 +346,6 @@ static void p54p_tx(struct ieee80211_hw *dev, struct p54_control_hdr *data,
                 printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
 }
 
-static int p54p_open(struct ieee80211_hw *dev)
-{
-        struct p54p_priv *priv = dev->priv;
-        int err;
-
-        init_completion(&priv->boot_comp);
-        err = request_irq(priv->pdev->irq, &p54p_interrupt,
-                          IRQF_SHARED, "p54pci", dev);
-        if (err) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(dev->wiphy));
-                return err;
-        }
-
-        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
-        err = p54p_upload_firmware(dev);
-        if (err) {
-                free_irq(priv->pdev->irq, dev);
-                return err;
-        }
-        priv->rx_idx_data = priv->tx_idx_data = 0;
-        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
-
-        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
-                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
-
-        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
-                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
-
-        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
-        P54P_READ(ring_control_base);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
-        P54P_READ(dev_int);
-
-        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s: Cannot boot firmware!\n",
-                       wiphy_name(dev->wiphy));
-                free_irq(priv->pdev->irq, dev);
-                return -ETIMEDOUT;
-        }
-
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
-        P54P_READ(dev_int);
-        wmb();
-        udelay(10);
-
-        return 0;
-}
-
 static void p54p_stop(struct ieee80211_hw *dev)
 {
         struct p54p_priv *priv = dev->priv;
@@ -474,6 +412,68 @@ static void p54p_stop(struct ieee80211_hw *dev)
         memset(ring_control, 0, sizeof(*ring_control));
 }
 
+static int p54p_open(struct ieee80211_hw *dev)
+{
+        struct p54p_priv *priv = dev->priv;
+        int err;
+
+        init_completion(&priv->boot_comp);
+        err = request_irq(priv->pdev->irq, &p54p_interrupt,
+                          IRQF_SHARED, "p54pci", dev);
+        if (err) {
+                printk(KERN_ERR "%s: failed to register IRQ handler\n",
+                       wiphy_name(dev->wiphy));
+                return err;
+        }
+
+        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
+        err = p54p_upload_firmware(dev);
+        if (err) {
+                free_irq(priv->pdev->irq, dev);
+                return err;
+        }
+        priv->rx_idx_data = priv->tx_idx_data = 0;
+        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
+
+        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
+                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
+
+        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
+                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
+
+        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
+        P54P_READ(ring_control_base);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
+        P54P_READ(dev_int);
+
+        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
+                printk(KERN_ERR "%s: Cannot boot firmware!\n",
+                       wiphy_name(dev->wiphy));
+                p54p_stop(dev);
+                return -ETIMEDOUT;
+        }
+
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
+        P54P_READ(dev_int);
+        wmb();
+        udelay(10);
+
+        return 0;
+}
+
 static int __devinit p54p_probe(struct pci_dev *pdev,
                                 const struct pci_device_id *id)
 {
@@ -556,11 +556,13 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
         spin_lock_init(&priv->lock);
         tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
 
-        p54p_open(dev);
+        err = p54p_open(dev);
+        if (err)
+                goto err_free_common;
         err = p54_read_eeprom(dev);
         p54p_stop(dev);
         if (err)
-                goto err_free_desc;
+                goto err_free_common;
 
         err = ieee80211_register_hw(dev);
         if (err) {
@@ -573,8 +575,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 
  err_free_common:
         p54_free_common(dev);
-
- err_free_desc:
         pci_free_consistent(pdev, sizeof(*priv->ring_control),
                             priv->ring_control, priv->ring_control_dma);
 
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index f839ce044afd..95511ac22470 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -1,5 +1,5 @@
 menuconfig RT2X00
-        bool "Ralink driver support"
+        tristate "Ralink driver support"
         depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
         ---help---
           This will enable the experimental support for the Ralink drivers,
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index a60ae86bd5c9..a3ccd8c1c716 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -61,6 +61,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
         { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
@@ -82,6 +83,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0cde, 0x001a), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
         /* "Driverless" devices that need ejecting */
         { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
         { USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 51e5214071da..224ae6bc67b6 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -105,7 +105,16 @@ EXPORT_SYMBOL(of_release_dev);
 int of_device_register(struct of_device *ofdev)
 {
         BUG_ON(ofdev->node == NULL);
-        return device_register(&ofdev->dev);
+
+        device_initialize(&ofdev->dev);
+
+        /* device_add will assume that this device is on the same node as
+         * the parent. If there is no parent defined, set the node
+         * explicitly */
+        if (!ofdev->dev.parent)
+                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node));
+
+        return device_add(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_register);
 
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index d962ba0dd87a..191a3202cecc 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -105,7 +105,7 @@ static int event_buffer_open(struct inode *inode, struct file *file)
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (test_and_set_bit(0, &buffer_opened))
+        if (test_and_set_bit_lock(0, &buffer_opened))
                 return -EBUSY;
 
         /* Register as a user of dcookies
@@ -129,7 +129,7 @@ static int event_buffer_open(struct inode *inode, struct file *file)
 fail:
         dcookie_unregister(file->private_data);
 out:
-        clear_bit(0, &buffer_opened);
+        __clear_bit_unlock(0, &buffer_opened);
         return err;
 }
 
@@ -141,7 +141,7 @@ static int event_buffer_release(struct inode *inode, struct file *file)
         dcookie_unregister(file->private_data);
         buffer_pos = 0;
         atomic_set(&buffer_ready, 0);
-        clear_bit(0, &buffer_opened);
+        __clear_bit_unlock(0, &buffer_opened);
         return 0;
 }
 
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index b1899e9c1f65..0cd5fbc7f2c2 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -112,7 +112,7 @@ static int parport_probe(struct pcmcia_device *link)
 
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
     link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
     link->irq.IRQInfo1 = IRQ_LEVEL_ID;
     link->conf.Attributes = CONF_ENABLE_IRQ;
     link->conf.IntType = INT_MEMORY_AND_IO;
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index dfe7c8e1b185..b3a63edb6901 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -83,6 +83,9 @@ static acpi_status acpi_run_osc(acpi_handle handle,
         if (ACPI_FAILURE(status))
                 return status;
 
+        if (!output.length)
+                return AE_NULL_OBJECT;
+
         out_obj = output.pointer;
         if (out_obj->type != ACPI_TYPE_BUFFER) {
                 printk(KERN_DEBUG "Evaluate _OSC returns wrong type\n");
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 110022d78689..5d72866897a8 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -575,7 +575,7 @@ static int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct
 
         nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
         start = vma->vm_pgoff;
-        size = pci_resource_len(pdev, resno) >> PAGE_SHIFT;
+        size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;
         if (start < size && size - start >= nr)
                 return 1;
         WARN(1, "process \"%s\" tried to map 0x%08lx-0x%08lx on %s BAR %d (size 0x%08lx)\n",
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 96cf8ecd04ce..5049a47030ac 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -43,20 +43,6 @@ static void __devinit quirk_mellanox_tavor(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor);
 
-/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
-int forbid_dac __read_mostly;
-EXPORT_SYMBOL(forbid_dac);
-
-static __devinit void via_no_dac(struct pci_dev *dev)
-{
-        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
-                dev_info(&dev->dev,
-                        "VIA PCI bridge detected. Disabling DAC.\n");
-                forbid_dac = 1;
-        }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
-
 /* Deal with broken BIOS'es that neglect to enable passive release,
    which can cause problems in combination with the 82441FX/PPro MTRRs */
 static void quirk_passive_release(struct pci_dev *dev)
@@ -1706,24 +1692,24 @@ static void __devinit quirk_brcm_570x_limit_vpd(struct pci_dev *dev)
         }
 }
 
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5706,
-                         quirk_brcm_570x_limit_vpd);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5706S,
-                         quirk_brcm_570x_limit_vpd);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5708,
-                         quirk_brcm_570x_limit_vpd);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5708S,
-                         quirk_brcm_570x_limit_vpd);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5709,
-                         quirk_brcm_570x_limit_vpd);
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM,
-                         PCI_DEVICE_ID_NX2_5709S,
-                         quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5706,
+                        quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5706S,
+                        quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5708,
+                        quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5708S,
+                        quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5709,
+                        quirk_brcm_570x_limit_vpd);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM,
+                        PCI_DEVICE_ID_NX2_5709S,
+                        quirk_brcm_570x_limit_vpd);
 
 #ifdef CONFIG_PCI_MSI
 /* Some chipsets do not support MSI. We cannot easily rely on setting
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 1f5f6143f35c..132a78159b60 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -100,7 +100,8 @@ size_t pci_get_rom_size(void __iomem *rom, size_t size)
  * pci_map_rom - map a PCI ROM to kernel space
  * @pdev: pointer to pci device struct
  * @size: pointer to receive size of pci window over ROM
- * @return: kernel virtual pointer to image of ROM
+ *
+ * Return: kernel virtual pointer to image of ROM
  *
  * Map a PCI ROM into kernel space. If ROM is boot video ROM,
  * the shadow BIOS copy will be returned instead of the
@@ -167,7 +168,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
  * pci_map_rom_copy - map a PCI ROM to kernel space, create a copy
  * @pdev: pointer to pci device struct
  * @size: pointer to receive size of pci window over ROM
- * @return: kernel virtual pointer to image of ROM
+ *
+ * Return: kernel virtual pointer to image of ROM
  *
  * Map a PCI ROM into kernel space. If ROM is boot video ROM,
  * the shadow BIOS copy will be returned instead of the
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index f57eeae3830a..222904411a13 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -188,10 +188,6 @@ config PCMCIA_M8XX
 
           This driver is also available as a module called m8xx_pcmcia.
 
-config HD64465_PCMCIA
-        tristate "HD64465 host bridge support"
-        depends on HD64465 && PCMCIA
-
 config PCMCIA_AU1X00
         tristate "Au1x00 pcmcia support"
         depends on SOC_AU1X00 && PCMCIA
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 23e492bf75cf..238629ad7f7c 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_I82365)				+= i82365.o
 obj-$(CONFIG_I82092)                            += i82092.o
 obj-$(CONFIG_TCIC)                              += tcic.o
 obj-$(CONFIG_PCMCIA_M8XX)                       += m8xx_pcmcia.o
-obj-$(CONFIG_HD64465_PCMCIA)                    += hd64465_ss.o
 obj-$(CONFIG_PCMCIA_SA1100)                     += sa11xx_core.o sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                     += sa11xx_core.o sa1111_cs.o
 obj-$(CONFIG_M32R_PCC)                          += m32r_pcc.o
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
deleted file mode 100644
index 9ef69cdb3183..000000000000
--- a/drivers/pcmcia/hd64465_ss.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
- * Device driver for the PCMCIA controller module of the
- * Hitachi HD64465 handheld companion chip.
- *
- * Note that the HD64465 provides a very thin PCMCIA host bridge
- * layer, requiring a lot of the work of supporting cards to be
- * performed by the processor.  For example: mapping of card
- * interrupts to processor IRQs is done by IRQ demuxing software;
- * IO and memory mappings are fixed; setting voltages according
- * to card Voltage Select pins etc is done in software.
- *
- * Note also that this driver uses only the simple, fixed,
- * 16MB, 16-bit wide mappings to PCMCIA spaces defined by the
- * HD64465.  Larger mappings, smaller mappings, or mappings of
- * different width to the same socket, are all possible only by
- * involving the SH7750's MMU, which is considered unnecessary here.
- * The downside is that it may be possible for some drivers to
- * break because they need or expect 8-bit mappings.
- *
- * This driver currently supports only the following configuration:
- * SH7750 CPU, HD64465, TPS2206 voltage control chip.
- *
- * by Greg Banks <gbanks@pocketpenguins.com>
- * (c) 2000 PocketPenguins Inc
- */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <asm/errno.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-
-#include <asm/io.h>
-#include <asm/hd64465/hd64465.h>
-#include <asm/hd64465/io.h>
-
-#include <pcmcia/cs_types.h>
-#include <pcmcia/cs.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/ss.h>
-
-#define MODNAME "hd64465_ss"
-
-/* #define HD64465_DEBUG 1 */
-
-#if HD64465_DEBUG
-#define DPRINTK(args...)        printk(MODNAME ": " args)
-#else
-#define DPRINTK(args...)
-#endif
-
-extern int hd64465_io_debug;
-extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);
-extern void p3_iounmap(void *addr);
-
-/*============================================================*/
-
-#define HS_IO_MAP_SIZE  (64*1024)
-
-typedef struct hs_socket_t
-{
-    unsigned int        number;
-    u_int               irq;
-    u_long              mem_base;
-    void                *io_base;
-    u_long              mem_length;
-    u_int               ctrl_base;
-    socket_state_t      state;
-    pccard_io_map       io_maps[MAX_IO_WIN];
-    pccard_mem_map      mem_maps[MAX_WIN];
-    struct pcmcia_socket        socket;
-} hs_socket_t;
-
-
-
-#define HS_MAX_SOCKETS 2
-static hs_socket_t hs_sockets[HS_MAX_SOCKETS];
-
-#define hs_in(sp, r)        inb((sp)->ctrl_base + (r))
-#define hs_out(sp, v, r)    outb(v, (sp)->ctrl_base + (r))
-
-
-/* translate a boolean value to a bit in a register */
-#define bool_to_regbit(sp, r, bi, bo)           \
-    do {                                        \
-        unsigned short v = hs_in(sp, r);        \
-        if (bo)                                 \
-            v |= (bi);                          \
-        else                                    \
-            v &= ~(bi);                         \
-        hs_out(sp, v, r);                       \
-    } while(0)
-    
-/* register offsets from HD64465_REG_PCC[01]ISR */
-#define ISR     0x0
-#define GCR     0x2
-#define CSCR    0x4
-#define CSCIER  0x6
-#define SCR     0x8
-
-
-/* Mask and values for CSCIER register */
-#define IER_MASK    0x80
-#define IER_ON      0x3f        /* interrupts on */
-#define IER_OFF     0x00        /* interrupts off */
-
-/*============================================================*/
-
-#if HD64465_DEBUG > 10
-
-static void cis_hex_dump(const unsigned char *x, int len)
-{
-        int i;
-        
-        for (i=0 ; i<len ; i++)
-        {
-            if (!(i & 0xf))
-                printk("\n%08x", (unsigned)(x + i));
-            printk(" %02x", *(volatile unsigned short*)x);
-            x += 2;
-        }
-        printk("\n");
-}
-
-#endif
-/*============================================================*/
-
-/*
- * This code helps create the illusion that the IREQ line from
- * the PC card is mapped to one of the CPU's IRQ lines by the
- * host bridge hardware (which is how every host bridge *except*
- * the HD64465 works).  In particular, it supports enabling
- * and disabling the IREQ line by code which knows nothing
- * about the host bridge (e.g. device drivers, IDE code) using
- * the request_irq(), free_irq(), probe_irq_on() and probe_irq_off()
- * functions.  Also, it supports sharing the mapped IRQ with
- * real hardware IRQs from the -IRL0-3 lines.
- */
-
-#define HS_NUM_MAPPED_IRQS  16  /* Limitation of the PCMCIA code */
-static struct
-{
-    /* index is mapped irq number */
-    hs_socket_t *sock;
-    hw_irq_controller *old_handler;
-} hs_mapped_irq[HS_NUM_MAPPED_IRQS];
-
-static void hs_socket_enable_ireq(hs_socket_t *sp)
-{
-        unsigned short cscier;
-        
-        DPRINTK("hs_socket_enable_ireq(sock=%d)\n", sp->number);
-
-        cscier = hs_in(sp, CSCIER);
-        cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK;
-        cscier |= HD64465_PCCCSCIER_PIREQE_LEVEL;
-        hs_out(sp, cscier, CSCIER);
-}
-
-static void hs_socket_disable_ireq(hs_socket_t *sp)
-{
-        unsigned short cscier;
-        
-        DPRINTK("hs_socket_disable_ireq(sock=%d)\n", sp->number);
-        
-        cscier = hs_in(sp, CSCIER);
-        cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK;
-        hs_out(sp, cscier, CSCIER);
-}
-
-static unsigned int hs_startup_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->startup(irq);
-        return 0;
-}
-
-static void hs_shutdown_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->shutdown(irq);
-}
-
-static void hs_enable_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->enable(irq);
-}
-
-static void hs_disable_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->disable(irq);
-}
-
-extern struct hw_interrupt_type no_irq_type;
-
-static void hs_mask_and_ack_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        /* ack_none() spuriously complains about an unexpected IRQ */
-        if (hs_mapped_irq[irq].old_handler != &no_irq_type)
-            hs_mapped_irq[irq].old_handler->ack(irq);
-}
-
-static void hs_end_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->end(irq);
-}
-
-
-static struct hw_interrupt_type hd64465_ss_irq_type = {
-        .typename       = "PCMCIA-IRQ",
-        .startup        = hs_startup_irq,
-        .shutdown       = hs_shutdown_irq,
-        .enable         = hs_enable_irq,
-        .disable        = hs_disable_irq,
-        .ack            = hs_mask_and_ack_irq,
-        .end            = hs_end_irq
-};
-
-/* 
- * This function should only ever be called with interrupts disabled.
- */
-static void hs_map_irq(hs_socket_t *sp, unsigned int irq)
-{
-        struct irq_desc *desc;
-
-        DPRINTK("hs_map_irq(sock=%d irq=%d)\n", sp->number, irq);
-        
-        if (irq >= HS_NUM_MAPPED_IRQS)
-            return;
-
-        desc = irq_to_desc(irq);
-        hs_mapped_irq[irq].sock = sp;
-        /* insert ourselves as the irq controller */
-        hs_mapped_irq[irq].old_handler = desc->chip;
-        desc->chip = &hd64465_ss_irq_type;
-}
-
-
-/* 
- * This function should only ever be called with interrupts disabled.
- */
-static void hs_unmap_irq(hs_socket_t *sp, unsigned int irq)
-{
-        struct irq_desc *desc;
-
-        DPRINTK("hs_unmap_irq(sock=%d irq=%d)\n", sp->number, irq);
-        
-        if (irq >= HS_NUM_MAPPED_IRQS)
-            return;
-                
-        desc = irq_to_desc(irq);
-        /* restore the original irq controller */
-        desc->chip = hs_mapped_irq[irq].old_handler;
-}
-
-/*============================================================*/
-
-
-/*
- * Set Vpp and Vcc (in tenths of a Volt).  Does not
- * support the hi-Z state.
- *
- * Note, this assumes the board uses a TPS2206 chip to control
- * the Vcc and Vpp voltages to the hs_sockets.  If your board
- * uses the MIC2563 (also supported by the HD64465) then you
- * will have to modify this function.
- */
-                                         /* 0V   3.3V  5.5V */
-static const u_char hs_tps2206_avcc[3] = { 0x00, 0x04, 0x08 };
-static const u_char hs_tps2206_bvcc[3] = { 0x00, 0x80, 0x40 };
-
-static int hs_set_voltages(hs_socket_t *sp, int Vcc, int Vpp)
-{
-        u_int psr;
-        u_int vcci = 0;
-        u_int sock = sp->number;
-        
-        DPRINTK("hs_set_voltage(%d, %d, %d)\n", sock, Vcc, Vpp);
-
-        switch (Vcc)
-        {
-        case 0:  vcci = 0; break;
-        case 33: vcci = 1; break;
-        case 50: vcci = 2; break;
-        default: return 0;
-        }
-
-        /* Note: Vpp = 120 not supported -- Greg Banks */
-        if (Vpp != 0 && Vpp != Vcc)
-            return 0;
-        
-        /* The PSR register holds 8 of the 9 bits which control
-         * the TPS2206 via its serial interface.
-         */
-        psr = inw(HD64465_REG_PCCPSR);
-        switch (sock)
-        {
-        case 0:
-            psr &= 0x0f;
-            psr |= hs_tps2206_avcc[vcci];
-            psr |= (Vpp == 0 ? 0x00 : 0x02);
-            break;
-        case 1:
-            psr &= 0xf0;
-            psr |= hs_tps2206_bvcc[vcci];
-            psr |= (Vpp == 0 ? 0x00 : 0x20);
-            break;
-        };
-        outw(psr, HD64465_REG_PCCPSR);
-        
-        return 1;
-}
-
-
-/*============================================================*/
-
-/*
- * Drive the RESET line to the card.
- */
-static void hs_reset_socket(hs_socket_t *sp, int on)
-{
-        unsigned short v;
-        
-        v = hs_in(sp, GCR);
-        if (on)
-            v |= HD64465_PCCGCR_PCCR;
-        else
-            v &= ~HD64465_PCCGCR_PCCR;
-        hs_out(sp, v, GCR);
-}
-
-/*============================================================*/
-
-static int hs_init(struct pcmcia_socket *s)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        
-        DPRINTK("hs_init(%d)\n", sp->number);
-
-        return 0;
-}
-
-/*============================================================*/
-
-
-static int hs_get_status(struct pcmcia_socket *s, u_int *value)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        unsigned int isr;
-        u_int status = 0;
-        
-        
-        isr = hs_in(sp, ISR);
-
-        /* Card is seated and powered when *both* CD pins are low */
-        if ((isr & HD64465_PCCISR_PCD_MASK) == 0)
-        {
-            status |= SS_DETECT;    /* card present */
-
-            switch (isr & HD64465_PCCISR_PBVD_MASK)
-            {
-            case HD64465_PCCISR_PBVD_BATGOOD:   
-                break;
-            case HD64465_PCCISR_PBVD_BATWARN:
-                status |= SS_BATWARN;
-                break;
-            default:
-                status |= SS_BATDEAD;
-                break;
-            }
-
-            if (isr & HD64465_PCCISR_PREADY)
-                status |= SS_READY;
-
-            if (isr & HD64465_PCCISR_PMWP)
-                status |= SS_WRPROT;
-                
-            /* Voltage Select pins interpreted as per Table 4-5 of the std.
-             * Assuming we have the TPS2206, the socket is a "Low Voltage
-             * key, 3.3V and 5V available, no X.XV available".
-             */
-            switch (isr & (HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1))
-            {
-            case HD64465_PCCISR_PVS1:
-                printk(KERN_NOTICE MODNAME ": cannot handle X.XV card, ignored\n");
-                status = 0;
-                break;
-            case 0:
-            case HD64465_PCCISR_PVS2:
-                /* 3.3V */
-                status |= SS_3VCARD;
-                break;
-            case HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1:
-                /* 5V */
-                break;
-            }
-                
-            /* TODO: SS_POWERON */
-            /* TODO: SS_STSCHG */
-        }       
-        
-        DPRINTK("hs_get_status(%d) = %x\n", sock, status);
-        
-        *value = status;
-        return 0;
-}
-
-/*============================================================*/
-
-static int hs_set_socket(struct pcmcia_socket *s, socket_state_t *state)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        u_long flags;
-        u_int changed;
-        unsigned short cscier;
-
-        DPRINTK("hs_set_socket(sock=%d, flags=%x, csc_mask=%x, Vcc=%d, Vpp=%d, io_irq=%d)\n",
-            sock, state->flags, state->csc_mask, state->Vcc, state->Vpp, state->io_irq);
-        
-        local_irq_save(flags);  /* Don't want interrupts happening here */
-
-        if (state->Vpp != sp->state.Vpp ||
-            state->Vcc != sp->state.Vcc) {
-            if (!hs_set_voltages(sp, state->Vcc, state->Vpp)) {
-                local_irq_restore(flags);
-                return -EINVAL;
-            }
-        }
-
-/*      hd64465_io_debug = 1; */
-        /*
-         * Handle changes in the Card Status Change mask,
-         * by propagating to the CSCR register
-         */     
-        changed = sp->state.csc_mask ^ state->csc_mask;
-        cscier = hs_in(sp, CSCIER);
-            
-        if (changed & SS_DETECT) {
-            if (state->csc_mask & SS_DETECT)
-                cscier |= HD64465_PCCCSCIER_PCDE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PCDE;
-        }
-
-        if (changed & SS_READY) {
-            if (state->csc_mask & SS_READY)
-                cscier |= HD64465_PCCCSCIER_PRE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PRE;
-        }
-
-        if (changed & SS_BATDEAD) {
-            if (state->csc_mask & SS_BATDEAD)
-                cscier |= HD64465_PCCCSCIER_PBDE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PBDE;
-        }
-
-        if (changed & SS_BATWARN) {
-            if (state->csc_mask & SS_BATWARN)
-                cscier |= HD64465_PCCCSCIER_PBWE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PBWE;
-        }
-
-        if (changed & SS_STSCHG) {
-            if (state->csc_mask & SS_STSCHG)
-                cscier |= HD64465_PCCCSCIER_PSCE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PSCE;
-        }
-
-        hs_out(sp, cscier, CSCIER);
-
-        if (sp->state.io_irq && !state->io_irq)
-            hs_unmap_irq(sp, sp->state.io_irq);
-        else if (!sp->state.io_irq && state->io_irq)
-            hs_map_irq(sp, state->io_irq);
-
-
-        /*
-         * Handle changes in the flags field,
-         * by propagating to config registers.
-         */     
-        changed = sp->state.flags ^ state->flags;
-
-        if (changed & SS_IOCARD) {
-            DPRINTK("card type: %s\n",
-                    (state->flags & SS_IOCARD ? "i/o" : "memory" ));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCT,
-                state->flags & SS_IOCARD);
-        }
-
-        if (changed & SS_RESET) {
-            DPRINTK("%s reset card\n",
-                (state->flags & SS_RESET ? "start" : "stop"));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCR,
-                state->flags & SS_RESET);
-        }
-
-        if (changed & SS_OUTPUT_ENA) {
-            DPRINTK("%sabling card output\n",
-                (state->flags & SS_OUTPUT_ENA ? "en" : "dis"));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PDRV,
-                state->flags & SS_OUTPUT_ENA);
-        }
-
-        /* TODO: SS_SPKR_ENA */
-            
-/*      hd64465_io_debug = 0; */
-        sp->state = *state;
-            
-        local_irq_restore(flags);
-
-#if HD64465_DEBUG > 10
-        if (state->flags & SS_OUTPUT_ENA)   
-            cis_hex_dump((const unsigned char*)sp->mem_base, 0x100);
-#endif
-        return 0;
-}
-
-/*============================================================*/
-
-static int hs_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        int map = io->map;
-        int sock = sp->number;
-        struct pccard_io_map *sio;
-        pgprot_t prot;
-
-        DPRINTK("hs_set_io_map(sock=%d, map=%d, flags=0x%x, speed=%dns, start=%#lx, stop=%#lx)\n",
-            sock, map, io->flags, io->speed, io->start, io->stop);
-        if (map >= MAX_IO_WIN)
-            return -EINVAL;
-        sio = &sp->io_maps[map];
-
-        /* check for null changes */    
-        if (io->flags == sio->flags &&
-            io->start == sio->start &&
-            io->stop == sio->stop)
-            return 0;
-        
-        if (io->flags & MAP_AUTOSZ)
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IODYN);
-        else if (io->flags & MAP_16BIT)
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO16);
-        else
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO8);
-
-        /* TODO: handle MAP_USE_WAIT */
-        if (io->flags & MAP_USE_WAIT)
-            printk(KERN_INFO MODNAME ": MAP_USE_WAIT unimplemented\n");
-        /* TODO: handle MAP_PREFETCH */
-        if (io->flags & MAP_PREFETCH)
-            printk(KERN_INFO MODNAME ": MAP_PREFETCH unimplemented\n");
-        /* TODO: handle MAP_WRPROT */
-        if (io->flags & MAP_WRPROT)
-            printk(KERN_INFO MODNAME ": MAP_WRPROT unimplemented\n");
-        /* TODO: handle MAP_0WS */
-        if (io->flags & MAP_0WS)
-            printk(KERN_INFO MODNAME ": MAP_0WS unimplemented\n");
-
-        if (io->flags & MAP_ACTIVE) {
-            unsigned long pstart, psize, paddrbase;
-            
-            paddrbase = virt_to_phys((void*)(sp->mem_base + 2 * HD64465_PCC_WINDOW));
-            pstart = io->start & PAGE_MASK;
-            psize = ((io->stop + PAGE_SIZE) & PAGE_MASK) - pstart;
-
-            /*
-             * Change PTEs in only that portion of the mapping requested
-             * by the caller.  This means that most of the time, most of
-             * the PTEs in the io_vma will be unmapped and only the bottom
-             * page will be mapped.  But the code allows for weird cards
-             * that might want IO ports > 4K.
-             */
-            sp->io_base = p3_ioremap(paddrbase + pstart, psize, pgprot_val(prot));
-            
-            /*
-             * Change the mapping used by inb() outb() etc
-             */
-            hd64465_port_map(io->start,
-                io->stop - io->start + 1,
-                (unsigned long)sp->io_base + io->start, 0);
-        } else {
-            hd64465_port_unmap(sio->start, sio->stop - sio->start + 1);
-            p3_iounmap(sp->io_base);
-        }
-        
-        *sio = *io;
-        return 0;
-}
-
-/*============================================================*/
-
-static int hs_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        struct pccard_mem_map *smem;
-        int map = mem->map;
-        unsigned long paddr;
-
-#if 0
-        DPRINTK("hs_set_mem_map(sock=%d, map=%d, flags=0x%x, card_start=0x%08x)\n",
-            sock, map, mem->flags, mem->card_start);
-#endif
-
-        if (map >= MAX_WIN)
-            return -EINVAL;
-        smem = &sp->mem_maps[map];
-        
-        paddr = sp->mem_base;               /* base of Attribute mapping */
-        if (!(mem->flags & MAP_ATTRIB))
-            paddr += HD64465_PCC_WINDOW;    /* base of Common mapping */
-        paddr += mem->card_start;
-
-        /* Because we specified SS_CAP_STATIC_MAP, we are obliged
-         * at this time to report the system address corresponding
-         * to the card address requested.  This is how Socket Services
-         * queries our fixed mapping.  I wish this fact had been
-         * documented - Greg Banks.
-         */
-        mem->static_start = paddr;
-        
-        *smem = *mem;
-        
-        return 0;
-}
-
-/* TODO: do we need to use the MMU to access Common memory ??? */
-
-/*============================================================*/
-
-/*
- * This function is registered with the HD64465 glue code to do a
- * secondary demux step on the PCMCIA interrupts.  It handles 
- * mapping the IREQ request from the card to a standard Linux
- * IRQ, as requested by SocketServices.
- */
-static int hs_irq_demux(int irq, void *dev)
-{
-        hs_socket_t *sp = dev;
-        u_int cscr;
-        
-        DPRINTK("hs_irq_demux(irq=%d)\n", irq);
-
-        if (sp->state.io_irq &&
-            (cscr = hs_in(sp, CSCR)) & HD64465_PCCCSCR_PIREQ) {
-            cscr &= ~HD64465_PCCCSCR_PIREQ;
-            hs_out(sp, cscr, CSCR);
-            return sp->state.io_irq;
-        }
-            
-        return irq;
-}
-
-/*============================================================*/
-
-/*
- * Interrupt handling routine.
- */
- 
-static irqreturn_t hs_interrupt(int irq, void *dev)
-{
-        hs_socket_t *sp = dev;
-        u_int events = 0;
-        u_int cscr;
-
-        cscr = hs_in(sp, CSCR);
-        
-        DPRINTK("hs_interrupt, cscr=%04x\n", cscr);
-
-        /* check for bus-related changes to be reported to Socket Services */
-        if (cscr & HD64465_PCCCSCR_PCDC) {
-            /* double-check for a 16-bit card, as we don't support CardBus */
-            if ((hs_in(sp, ISR) & HD64465_PCCISR_PCD_MASK) != 0) {
-                printk(KERN_NOTICE MODNAME
-                    ": socket %d, card not a supported card type or not inserted correctly\n",
-                    sp->number);
-                /* Don't do the rest unless a card is present */
-                cscr &= ~(HD64465_PCCCSCR_PCDC|
-                          HD64465_PCCCSCR_PRC|
-                          HD64465_PCCCSCR_PBW|
-                          HD64465_PCCCSCR_PBD|
-                          HD64465_PCCCSCR_PSC);
-            } else {
-                cscr &= ~HD64465_PCCCSCR_PCDC;
-                events |= SS_DETECT;            /* card insertion or removal */
-            }
-        }
-        if (cscr & HD64465_PCCCSCR_PRC) {
-            cscr &= ~HD64465_PCCCSCR_PRC;
-            events |= SS_READY;         /* ready signal changed */
-        }
-        if (cscr & HD64465_PCCCSCR_PBW) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_BATWARN;       /* battery warning */
-        }
-        if (cscr & HD64465_PCCCSCR_PBD) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_BATDEAD;       /* battery dead */
-        }
-        if (cscr & HD64465_PCCCSCR_PSC) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_STSCHG;        /* STSCHG (status changed) signal */
-        }
-        
-        if (cscr & HD64465_PCCCSCR_PIREQ) {
-            cscr &= ~HD64465_PCCCSCR_PIREQ;
-
-            /* This should have been dealt with during irq demux */         
-            printk(KERN_NOTICE MODNAME ": unexpected IREQ from card\n");
-        }
-
-        hs_out(sp, cscr, CSCR);
-
-        if (events)
-                pcmcia_parse_events(&sp->socket, events);
-
-        return IRQ_HANDLED;
-}
-
-/*============================================================*/
-
-static struct pccard_operations hs_operations = {
-        .init                   = hs_init,
-        .get_status             = hs_get_status,
-        .set_socket             = hs_set_socket,
-        .set_io_map             = hs_set_io_map,
-        .set_mem_map            = hs_set_mem_map,
-};
-
-static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base,
-            unsigned int ctrl_base)
-{
-        unsigned short v;
-        int i, err;
-
-        memset(sp, 0, sizeof(*sp));
-        sp->irq = irq;
-        sp->mem_base = mem_base;
-        sp->mem_length = 4*HD64465_PCC_WINDOW;  /* 16MB */
-        sp->ctrl_base = ctrl_base;
-        
-        for (i=0 ; i<MAX_IO_WIN ; i++)
-            sp->io_maps[i].map = i;
-        for (i=0 ; i<MAX_WIN ; i++)
-            sp->mem_maps[i].map = i;
-        
-        hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp);
-        
-        if ((err = request_irq(sp->irq, hs_interrupt, IRQF_DISABLED, MODNAME, sp)) < 0)
-            return err;
-        if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) {
-            sp->mem_base = 0;
-            return -ENOMEM;
-        }
-
-
-        /* According to section 3.2 of the PCMCIA standard, low-voltage
-         * capable cards must implement cold insertion, i.e. Vpp and
-         * Vcc set to 0 before card is inserted.
-         */
-        /*hs_set_voltages(sp, 0, 0);*/
-        
-        /* hi-Z the outputs to the card and set 16MB map mode */
-        v = hs_in(sp, GCR);
-        v &= ~HD64465_PCCGCR_PCCT;      /* memory-only card */
-        hs_out(sp, v, GCR);
-
-        v = hs_in(sp, GCR);
-        v |= HD64465_PCCGCR_PDRV;       /* enable outputs to card */
-        hs_out(sp, v, GCR);
-
-        v = hs_in(sp, GCR);
-        v |= HD64465_PCCGCR_PMMOD;      /* 16MB mapping mode */
-        hs_out(sp, v, GCR);
-
-        v = hs_in(sp, GCR);
-        /* lowest 16MB of Common */
-        v &= ~(HD64465_PCCGCR_PPA25|HD64465_PCCGCR_PPA24); 
-        hs_out(sp, v, GCR);
-        
-        hs_reset_socket(sp, 1);
-
-        printk(KERN_INFO "HD64465 PCMCIA bridge socket %d at 0x%08lx irq %d\n",
-                i, sp->mem_base, sp->irq);
-
-        return 0;
-}
-
-static void hs_exit_socket(hs_socket_t *sp)
-{
-        unsigned short cscier, gcr;
-        unsigned long flags;
-        
-        local_irq_save(flags);
-
-        /* turn off interrupts in hardware */
-        cscier = hs_in(sp, CSCIER);
-        cscier = (cscier & IER_MASK) | IER_OFF;
-        hs_out(sp, cscier, CSCIER);
-        
-        /* hi-Z the outputs to the card */
-        gcr = hs_in(sp, GCR);
-        gcr &= HD64465_PCCGCR_PDRV;
-        hs_out(sp, gcr, GCR);
-
-        /* power the card down */
-        hs_set_voltages(sp, 0, 0);
-
-        if (sp->mem_base != 0)
-            release_mem_region(sp->mem_base, sp->mem_length);
-        if (sp->irq != 0) {
-            free_irq(sp->irq, hs_interrupt);
-            hd64465_unregister_irq_demux(sp->irq);
-        }
-
-        local_irq_restore(flags);
-}
-
-static struct device_driver hd64465_driver = {
-        .name = "hd64465-pcmcia",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
-};
-
-static struct platform_device hd64465_device = {
-        .name = "hd64465-pcmcia",
-        .id = 0,
-};
-
-static int __init init_hs(void)
-{
-        int i;
-        unsigned short v;
-
-/*      hd64465_io_debug = 1; */
-        if (driver_register(&hd64465_driver))
-                return -EINVAL;
-        
-        /* Wake both sockets out of STANDBY mode */
-        /* TODO: wait 15ms */
-        v = inw(HD64465_REG_SMSCR);
-        v &= ~(HD64465_SMSCR_PC0ST|HD64465_SMSCR_PC1ST);
-        outw(v, HD64465_REG_SMSCR);
-
-        /* keep power controller out of shutdown mode */
-        v = inb(HD64465_REG_PCC0SCR);
-        v |= HD64465_PCCSCR_SHDN;
-        outb(v, HD64465_REG_PCC0SCR);
-
-        /* use serial (TPS2206) power controller */
-        v = inb(HD64465_REG_PCC0CSCR);
-        v |= HD64465_PCCCSCR_PSWSEL;
-        outb(v, HD64465_REG_PCC0CSCR);
-
-        /*
-         * Setup hs_sockets[] structures and request system resources.
-         * TODO: on memory allocation failure, power down the socket
-         *       before quitting.
-         */
-        for (i=0; i<HS_MAX_SOCKETS; i++) {
-                hs_set_voltages(&hs_sockets[i], 0, 0);
-
-                hs_sockets[i].socket.features |=  SS_CAP_PCCARD | SS_CAP_STATIC_MAP;      /* mappings are fixed in host memory */
-                hs_sockets[i].socket.resource_ops = &pccard_static_ops;
-                hs_sockets[i].socket.irq_mask =  0xffde;/*0xffff*/          /* IRQs mapped in s/w so can do any, really */
-                hs_sockets[i].socket.map_size = HD64465_PCC_WINDOW;     /* 16MB fixed window size */
-
-                hs_sockets[i].socket.owner = THIS_MODULE;
-                hs_sockets[i].socket.ss_entry = &hs_operations;
-        }
-
-        i = hs_init_socket(&hs_sockets[0],
-            HD64465_IRQ_PCMCIA0,
-            HD64465_PCC0_BASE,
-            HD64465_REG_PCC0ISR);
-        if (i < 0) {
-                unregister_driver(&hd64465_driver);
-                return i;
-        }
-        i = hs_init_socket(&hs_sockets[1],
-            HD64465_IRQ_PCMCIA1,
-            HD64465_PCC1_BASE,
-            HD64465_REG_PCC1ISR);
-        if (i < 0) {
-                unregister_driver(&hd64465_driver);
-                return i;
-        }
-
-/*      hd64465_io_debug = 0; */
-
-        platform_device_register(&hd64465_device);
-
-        for (i=0; i<HS_MAX_SOCKETS; i++) {
-                unsigned int ret;
-                hs_sockets[i].socket.dev.parent = &hd64465_device.dev;
-                hs_sockets[i].number = i;
-                ret = pcmcia_register_socket(&hs_sockets[i].socket);
-                if (ret && i)
-                        pcmcia_unregister_socket(&hs_sockets[0].socket);
-        }
-
-        return 0;
-}
-
-static void __exit exit_hs(void)
-{
-        int i;
-
-        for (i=0 ; i<HS_MAX_SOCKETS ; i++) {
-                pcmcia_unregister_socket(&hs_sockets[i].socket);
-                hs_exit_socket(&hs_sockets[i]);
-        }
-
-        platform_device_unregister(&hd64465_device);
-        unregister_driver(&hd64465_driver);
-}
-
-module_init(init_hs);
-module_exit(exit_hs);
-
-/*============================================================*/
-/*END*/
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index afea2b2558b5..76d4a98f0955 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         type = 0;
         if (s->functions > 1)           /* All of this ought to be handled higher up */
                 type = IRQF_SHARED;
-        if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
+        else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
                 type = IRQF_SHARED;
+        else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
 
 #ifdef CONFIG_PCMCIA_PROBE
 
diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 478a4a739c00..c3f1c8e9d254 100644
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/types.h>
-#include <linux/pnp.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <linux/slab.h>
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index 85edf945ab86..204158cf7a55 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
+#include <asm/smp.h>
 #include <asm/time.h>
 #include <asm/ps3.h>
 #include <asm/lv1call.h>
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 4dada6ee1119..39360e2a4540 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -1,6 +1,4 @@
-menu "Voltage and Current regulators"
-
-config REGULATOR
+menuconfig REGULATOR
         bool "Voltage and Current Regulator Support"
         default n
         help
@@ -23,21 +21,20 @@ config REGULATOR
 
           If unsure, say no.
 
+if REGULATOR
+
 config REGULATOR_DEBUG
         bool "Regulator debug support"
-        depends on REGULATOR
         help
           Say yes here to enable debugging support.
 
 config REGULATOR_FIXED_VOLTAGE
         tristate
         default n
-        select REGULATOR
 
 config REGULATOR_VIRTUAL_CONSUMER
         tristate "Virtual regulator consumer support"
         default n
-        select REGULATOR
         help
           This driver provides a virtual consumer for the voltage and
           current regulator API which provides sysfs controls for
@@ -49,7 +46,6 @@ config REGULATOR_VIRTUAL_CONSUMER
 config REGULATOR_BQ24022
         tristate "TI bq24022 Dual Input 1-Cell Li-Ion Charger IC"
         default n
-        select REGULATOR
         help
           This driver controls a TI bq24022 Charger attached via
           GPIOs. The provided current regulator can enable/disable
@@ -59,7 +55,6 @@ config REGULATOR_BQ24022
 config REGULATOR_WM8350
         tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"
         depends on MFD_WM8350
-        select REGULATOR
         help
           This driver provides support for the voltage and current regulators
           of the WM8350 AudioPlus PMIC.
@@ -67,7 +62,6 @@ config REGULATOR_WM8350
 config REGULATOR_WM8400
         tristate "Wolfson Microelectroncis WM8400 AudioPlus PMIC"
         depends on MFD_WM8400
-        select REGULATOR
         help
           This driver provides support for the voltage regulators of the
           WM8400 AudioPlus PMIC.
@@ -75,9 +69,8 @@ config REGULATOR_WM8400
 config REGULATOR_DA903X
         tristate "Support regulators on Dialog Semiconductor DA9030/DA9034 PMIC"
         depends on PMIC_DA903X
-        select REGULATOR
         help
           Say y here to support the BUCKs and LDOs regulators found on
           Dialog Semiconductor DA9030/DA9034 PMIC.
 
-endmenu
+endif
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 3688e339db87..773b29cec8be 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -79,6 +79,11 @@ struct da903x_regulator_info {
         int     enable_bit;
 };
 
+static inline struct device *to_da903x_dev(struct regulator_dev *rdev)
+{
+        return rdev_get_dev(rdev)->parent->parent;
+}
+
 static inline int check_range(struct da903x_regulator_info *info,
                                 int min_uV, int max_uV)
 {
@@ -93,7 +98,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
 
         if (check_range(info, min_uV, max_uV)) {
@@ -111,7 +116,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
 static int da903x_get_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -128,7 +133,7 @@ static int da903x_get_voltage(struct regulator_dev *rdev)
 static int da903x_enable(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
 
         return da903x_set_bits(da9034_dev, info->enable_reg,
                                         1 << info->enable_bit);
@@ -137,7 +142,7 @@ static int da903x_enable(struct regulator_dev *rdev)
 static int da903x_disable(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
 
         return da903x_clr_bits(da9034_dev, info->enable_reg,
                                         1 << info->enable_bit);
@@ -146,7 +151,7 @@ static int da903x_disable(struct regulator_dev *rdev)
 static int da903x_is_enabled(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t reg_val;
         int ret;
 
@@ -162,7 +167,7 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
                                        int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -189,7 +194,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int thresh;
 
@@ -215,7 +220,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
 static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -238,7 +243,7 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
                                   int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -264,7 +269,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
                                     int min_uV, int max_uV)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
 
         if (check_range(info, min_uV, max_uV)) {
@@ -283,7 +288,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
 static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
 {
         struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
         uint8_t val, mask;
         int ret;
 
@@ -466,7 +471,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
         if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
                 ri->desc.ops = &da9030_regulator_ldo1_15_ops;
 
-        rdev = regulator_register(&ri->desc, pdev->dev.parent, ri);
+        rdev = regulator_register(&ri->desc, &pdev->dev, ri);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 7af60b98d8a4..a04c1b6b1575 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -271,7 +271,7 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
                 dev_dbg(&rtc->dev, "alarm rollover: %s\n", "year");
                 do {
                         alarm->time.tm_year++;
-                } while (!rtc_valid_tm(&alarm->time));
+                } while (rtc_valid_tm(&alarm->time) != 0);
                 break;
 
         default:
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 5549231179a2..6cf8e282338f 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -794,7 +794,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                 goto cleanup2;
         }
 
-        pr_info("%s: alarms up to one %s%s, %zd bytes nvram, %s irqs\n",
+        pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n",
                         cmos_rtc.rtc->dev.bus_id,
                         is_valid_irq(rtc_irq)
                                 ?  (cmos_rtc.mon_alrm
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 079e9ed907e0..ecdea44ae4e5 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -446,9 +446,6 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
         if (rtc->ops->release)
                 rtc->ops->release(rtc->dev.parent);
 
-        if (file->f_flags & FASYNC)
-                rtc_dev_fasync(-1, file, 0);
-
         clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
         return 0;
 }
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index 37d131d03f33..45e5b106af73 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -189,7 +189,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = {
         .set_time       = ds3234_set_time,
 };
 
-static int ds3234_probe(struct spi_device *spi)
+static int __devinit ds3234_probe(struct spi_device *spi)
 {
         struct rtc_device *rtc;
         unsigned char tmp;
@@ -249,7 +249,7 @@ static int ds3234_probe(struct spi_device *spi)
         return 0;
 }
 
-static int __exit ds3234_remove(struct spi_device *spi)
+static int __devexit ds3234_remove(struct spi_device *spi)
 {
         struct ds3234 *chip = platform_get_drvdata(spi);
         struct rtc_device *rtc = chip->rtc;
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 04b63dab6932..43afb7ab5289 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -87,6 +87,10 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm)
                 dev_dbg(dev, "Century bit is enabled\n");
                 tm->tm_year += 100;     /* one century */
         }
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        tm->tm_year += 68;
+#endif
 
         tm->tm_wday     = bcd2bin(val & 0x07);
         tm->tm_hour     = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F);
@@ -110,11 +114,20 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
         struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
         unsigned long flags;
         u8 val = 0;
+        int year = tm->tm_year;
+
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        year -= 68;
+#endif
 
         dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n",
-                tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
+                year + 1900, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
+        if (year < 0)
+                return -EINVAL;
+
         spin_lock_irqsave(&m48t59->lock, flags);
         /* Issue the WRITE command */
         M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL);
@@ -125,9 +138,9 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
         M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY);
         /* tm_mon is 0-11 */
         M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH);
-        M48T59_WRITE(bin2bcd(tm->tm_year % 100), M48T59_YEAR);
+        M48T59_WRITE(bin2bcd(year % 100), M48T59_YEAR);
 
-        if (pdata->type == M48T59RTC_TYPE_M48T59 && (tm->tm_year / 100))
+        if (pdata->type == M48T59RTC_TYPE_M48T59 && (year / 100))
                 val = (M48T59_WDAY_CEB | M48T59_WDAY_CB);
         val |= (bin2bcd(tm->tm_wday) & 0x07);
         M48T59_WRITE(val, M48T59_WDAY);
@@ -159,6 +172,10 @@ static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
         M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL);
 
         tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR));
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        tm->tm_year += 68;
+#endif
         /* tm_mon is 0-11 */
         tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1;
 
@@ -192,11 +209,20 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct rtc_time *tm = &alrm->time;
         u8 mday, hour, min, sec;
         unsigned long flags;
+        int year = tm->tm_year;
+
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        year -= 68;
+#endif
 
         /* If no irq, we don't support ALARM */
         if (m48t59->irq == NO_IRQ)
                 return -EIO;
 
+        if (year < 0)
+                return -EINVAL;
+
         /*
          * 0xff means "always match"
          */
@@ -228,7 +254,7 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         spin_unlock_irqrestore(&m48t59->lock, flags);
 
         dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n",
-                tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
+                year + 1900, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
         return 0;
 }
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 910bc704939c..f59277bbedaa 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -455,6 +455,8 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
 
         s3c_rtc_setfreq(&pdev->dev, 1);
 
+        device_init_wakeup(&pdev->dev, 1);
+
         /* register RTC and exit */
 
         rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
@@ -507,7 +509,7 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 #define s3c_rtc_resume  NULL
 #endif
 
-static struct platform_driver s3c2410_rtcdrv = {
+static struct platform_driver s3c2410_rtc_driver = {
         .probe          = s3c_rtc_probe,
         .remove         = __devexit_p(s3c_rtc_remove),
         .suspend        = s3c_rtc_suspend,
@@ -523,12 +525,12 @@ static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics
 static int __init s3c_rtc_init(void)
 {
         printk(banner);
-        return platform_driver_register(&s3c2410_rtcdrv);
+        return platform_driver_register(&s3c2410_rtc_driver);
 }
 
 static void __exit s3c_rtc_exit(void)
 {
-        platform_driver_unregister(&s3c2410_rtcdrv);
+        platform_driver_unregister(&s3c2410_rtc_driver);
 }
 
 module_init(s3c_rtc_init);
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 023803dbb0c7..ae18baf59f06 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -76,7 +76,7 @@ tapeblock_trigger_requeue(struct tape_device *device)
 static void
 tapeblock_end_request(struct request *req, int error)
 {
-        if (__blk_end_request(req, error, blk_rq_bytes(req)))
+        if (blk_end_request(req, error, blk_rq_bytes(req)))
                 BUG();
 }
 
@@ -166,7 +166,7 @@ tapeblock_requeue(struct work_struct *work) {
                 nr_queued++;
         spin_unlock(get_ccwdev_lock(device->cdev));
 
-        spin_lock(&device->blk_data.request_queue_lock);
+        spin_lock_irq(&device->blk_data.request_queue_lock);
         while (
                 !blk_queue_plugged(queue) &&
                 elv_next_request(queue)   &&
@@ -176,7 +176,9 @@ tapeblock_requeue(struct work_struct *work) {
                 if (rq_data_dir(req) == WRITE) {
                         DBF_EVENT(1, "TBLOCK: Rejecting write request\n");
                         blkdev_dequeue_request(req);
+                        spin_unlock_irq(&device->blk_data.request_queue_lock);
                         tapeblock_end_request(req, -EIO);
+                        spin_lock_irq(&device->blk_data.request_queue_lock);
                         continue;
                 }
                 blkdev_dequeue_request(req);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index d7073dbf825c..f9bb51fa7f5b 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -1200,7 +1200,7 @@ tape_open(struct tape_device *device)
 {
         int rc;
 
-        spin_lock(get_ccwdev_lock(device->cdev));
+        spin_lock_irq(get_ccwdev_lock(device->cdev));
         if (device->tape_state == TS_NOT_OPER) {
                 DBF_EVENT(6, "TAPE:nodev\n");
                 rc = -ENODEV;
@@ -1218,7 +1218,7 @@ tape_open(struct tape_device *device)
                 tape_state_set(device, TS_IN_USE);
                 rc = 0;
         }
-        spin_unlock(get_ccwdev_lock(device->cdev));
+        spin_unlock_irq(get_ccwdev_lock(device->cdev));
         return rc;
 }
 
@@ -1228,11 +1228,11 @@ tape_open(struct tape_device *device)
 int
 tape_release(struct tape_device *device)
 {
-        spin_lock(get_ccwdev_lock(device->cdev));
+        spin_lock_irq(get_ccwdev_lock(device->cdev));
         if (device->tape_state == TS_IN_USE)
                 tape_state_set(device, TS_UNUSED);
         module_put(device->discipline->owner);
-        spin_unlock(get_ccwdev_lock(device->cdev));
+        spin_unlock_irq(get_ccwdev_lock(device->cdev));
         return 0;
 }
 
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index b5390821434f..f05590355be8 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -20,6 +20,7 @@ static struct dentry *debugfs_root;
 #define MAX_DEBUGFS_QUEUES      32
 static struct dentry *debugfs_queues[MAX_DEBUGFS_QUEUES] = { NULL };
 static DEFINE_MUTEX(debugfs_mutex);
+#define QDIO_DEBUGFS_NAME_LEN   40
 
 void qdio_allocate_do_dbf(struct qdio_initialize *init_data)
 {
@@ -152,17 +153,6 @@ static int qstat_seq_open(struct inode *inode, struct file *filp)
                            filp->f_path.dentry->d_inode->i_private);
 }
 
-static void get_queue_name(struct qdio_q *q, struct ccw_device *cdev, char *name)
-{
-        memset(name, 0, sizeof(name));
-        sprintf(name, "%s", dev_name(&cdev->dev));
-        if (q->is_input_q)
-                sprintf(name + strlen(name), "_input");
-        else
-                sprintf(name + strlen(name), "_output");
-        sprintf(name + strlen(name), "_%d", q->nr);
-}
-
 static void remove_debugfs_entry(struct qdio_q *q)
 {
         int i;
@@ -189,14 +179,17 @@ static struct file_operations debugfs_fops = {
 static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev)
 {
         int i = 0;
-        char name[40];
+        char name[QDIO_DEBUGFS_NAME_LEN];
 
         while (debugfs_queues[i] != NULL) {
                 i++;
                 if (i >= MAX_DEBUGFS_QUEUES)
                         return;
         }
-        get_queue_name(q, cdev, name);
+        snprintf(name, QDIO_DEBUGFS_NAME_LEN, "%s_%s_%d",
+                 dev_name(&cdev->dev),
+                 q->is_input_q ? "input" : "output",
+                 q->nr);
         debugfs_queues[i] = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
                                                 debugfs_root, q, &debugfs_fops);
 }
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index a50682d2a0fa..7c8659151993 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -1083,7 +1083,6 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 case -EIO:
                         sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
                         QDIO_DBF_TEXT2(1, setup, dbf_text);
-                        qdio_int_error(cdev);
                         return;
                 case -ETIMEDOUT:
                         sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 7de410d5be4a..52d26592c72c 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3025,7 +3025,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
         struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
         int offset)
 {
-        int length = skb->len - offset;
+        int length = skb->len;
         int length_here;
         int element;
         char *data;
@@ -3037,6 +3037,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
 
         if (offset >= 0) {
                 data = skb->data + offset;
+                length -= offset;
                 first_lap = 0;
         }
 
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 955ba7a31b90..1b1e80336d2c 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -373,8 +373,6 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
@@ -451,12 +449,15 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
                         netif_rx(skb);
                         break;
                 case QETH_HEADER_TYPE_OSN:
-                        skb_push(skb, sizeof(struct qeth_hdr));
-                        skb_copy_to_linear_data(skb, hdr,
+                        if (card->info.type == QETH_CARD_TYPE_OSN) {
+                                skb_push(skb, sizeof(struct qeth_hdr));
+                                skb_copy_to_linear_data(skb, hdr,
                                                 sizeof(struct qeth_hdr));
-                        len = skb->len;
-                        card->osn_info.data_cb(skb);
-                        break;
+                                len = skb->len;
+                                card->osn_info.data_cb(skb);
+                                break;
+                        }
+                        /* else unknown */
                 default:
                         dev_kfree_skb_any(skb);
                         QETH_DBF_TEXT(TRACE, 3, "inbunkno");
@@ -975,12 +976,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
-
         recover_flag = card->state;
         rc = ccw_device_set_online(CARD_RDEV(card));
         if (rc) {
@@ -1091,11 +1086,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,
         if (card->dev && netif_carrier_ok(card->dev))
                 netif_carrier_off(card->dev);
         recover_flag = card->state;
-        if (qeth_l2_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
+        qeth_l2_stop_card(card, recovery_mode);
         rc  = ccw_device_set_offline(CARD_DDEV(card));
         rc2 = ccw_device_set_offline(CARD_WDEV(card));
         rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 99547dea44de..ed59fedd5922 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
         if (card->read.state == CH_STATE_UP &&
             card->write.state == CH_STATE_UP &&
             (card->state == CARD_STATE_UP)) {
@@ -3049,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
 
         qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
 
         recover_flag = card->state;
         rc = ccw_device_set_online(CARD_RDEV(card));
@@ -3170,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
         if (card->dev && netif_carrier_ok(card->dev))
                 netif_carrier_off(card->dev);
         recover_flag = card->state;
-        if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
+        qeth_l3_stop_card(card, recovery_mode);
         rc  = ccw_device_set_offline(CARD_DDEV(card));
         rc2 = ccw_device_set_offline(CARD_WDEV(card));
         rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index 210ddb639748..c144b9924d52 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -121,9 +121,6 @@ static ssize_t qeth_l3_dev_route6_show(struct device *dev,
         if (!card)
                 return -EINVAL;
 
-        if (!qeth_is_supported(card, IPA_IPV6))
-                return sprintf(buf, "%s\n", "n/a");
-
         return qeth_l3_dev_route_show(card, &card->options.route6, buf);
 }
 
@@ -135,10 +132,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
         if (!card)
                 return -EINVAL;
 
-        if (!qeth_is_supported(card, IPA_IPV6)) {
-                return -EOPNOTSUPP;
-        }
-
         return qeth_l3_dev_route_store(card, &card->options.route6,
                                 QETH_PROT_IPV6, buf, count);
 }
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 2bec9ccc0293..a9a9893a5f95 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -36,7 +36,6 @@
 #include <linux/poll.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/genhd.h>
 #include <linux/blkdev.h>
 
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index c33bcb284df7..56f4e6bffc21 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -290,9 +290,11 @@
 #include <scsi/scsi_ioctl.h>
 #include "fdomain.h"
 
+#ifndef PCMCIA
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
 MODULE_LICENSE("GPL");
+#endif
 
   
 #define VERSION          "$Revision: 5.51 $"
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index afe1de998763..a454f94623d7 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -2988,17 +2988,6 @@ static int megasas_mgmt_open(struct inode *inode, struct file *filep)
 }
 
 /**
- * megasas_mgmt_release - char node "release" entry point
- */
-static int megasas_mgmt_release(struct inode *inode, struct file *filep)
-{
-        filep->private_data = NULL;
-        fasync_helper(-1, filep, 0, &megasas_async_queue);
-
-        return 0;
-}
-
-/**
  * megasas_mgmt_fasync -        Async notifier registration from applications
  *
  * This function adds the calling process to a driver global queue. When an
@@ -3345,7 +3334,6 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
 static const struct file_operations megasas_mgmt_fops = {
         .owner = THIS_MODULE,
         .open = megasas_mgmt_open,
-        .release = megasas_mgmt_release,
         .fasync = megasas_mgmt_fasync,
         .unlocked_ioctl = megasas_mgmt_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9adf35bd8b56..5103855242ae 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -327,7 +327,6 @@ sg_release(struct inode *inode, struct file *filp)
         if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                 return -ENXIO;
         SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name));
-        sg_fasync(-1, filp, 0); /* remove filp from async notification list */
         if (0 == sg_remove_sfp(sdp, sfp)) {     /* Returns 1 when sdp gone */
                 if (!sdp->detached) {
                         scsi_device_put(sdp->device);
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index c94d3c4b7521..579d63a81aa2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3
           say Y or M.  Otherwise, say N.
 
 config SERIAL_NETX
-        bool "NetX serial port support"
+        tristate "NetX serial port support"
         depends on ARM && ARCH_NETX
         select SERIAL_CORE
         help
@@ -1288,7 +1288,7 @@ config SERIAL_NETX
 
 config SERIAL_NETX_CONSOLE
         bool "Console on NetX serial port"
-        depends on SERIAL_NETX
+        depends on SERIAL_NETX=y
         select SERIAL_CORE_CONSOLE
         help
           If you have enabled the serial port on the Hilscher NetX SoC
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 61fb8b6d19af..d5efd6c77904 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -1258,6 +1258,8 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
                 atmel_port->clk = clk_get(&pdev->dev, "usart");
                 clk_enable(atmel_port->clk);
                 port->uartclk = clk_get_rate(atmel_port->clk);
+                clk_disable(atmel_port->clk);
+                /* only enable clock when USART is in use */
         }
 
         atmel_port->use_dma_rx = data->use_dma_rx;
@@ -1379,6 +1381,8 @@ static int __init atmel_console_setup(struct console *co, char *options)
                 return -ENODEV;
         }
 
+        clk_enable(atmel_ports[co->index].clk);
+
         UART_PUT_IDR(port, -1);
         UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
         UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);
@@ -1403,7 +1407,7 @@ static struct console atmel_console = {
         .data           = &atmel_uart,
 };
 
-#define ATMEL_CONSOLE_DEVICE    &atmel_console
+#define ATMEL_CONSOLE_DEVICE    (&atmel_console)
 
 /*
  * Early console initialization (before VM subsystem initialized).
@@ -1534,6 +1538,15 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev)
         if (ret)
                 goto err_add_port;
 
+        if (atmel_is_console_port(&port->uart)
+                        && ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) {
+                /*
+                 * The serial core enabled the clock for us, so undo
+                 * the clk_enable() in atmel_console_setup()
+                 */
+                clk_disable(port->clk);
+        }
+
         device_init_wakeup(&pdev->dev, 1);
         platform_set_drvdata(pdev, port);
 
@@ -1544,7 +1557,6 @@ err_add_port:
         port->rx_ring.buf = NULL;
 err_alloc_ring:
         if (!atmel_is_console_port(&port->uart)) {
-                clk_disable(port->clk);
                 clk_put(port->clk);
                 port->clk = NULL;
         }
@@ -1568,7 +1580,6 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
 
         /* "port" is allocated statically, so we shouldn't free it */
 
-        clk_disable(atmel_port->clk);
         clk_put(atmel_port->clk);
 
         return ret;
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 211c21797ce0..8b2c619a09f2 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/system.h>
 #include <linux/delay.h>
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /* non-arch dependent serial structures are in linux/serial.h */
 #include <linux/serial.h>
 /* while we keep our own stuff (struct e100_serial) in a local .h file */
 #include "crisv10.h"
 #include <asm/fasttimer.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
 #ifndef CONFIG_ETRAX_FAST_TIMER
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index e3c5c8c3c09b..f36a729280bc 100644
--- a/drivers/serial/crisv10.h
+++ b/drivers/serial/crisv10.h
@@ -10,7 +10,7 @@
 #include <linux/circ_buf.h>
 #include <asm/termios.h>
 #include <asm/dma.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 /* Software state per channel */
 
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3f489329e8d3..3e5dda8518b7 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -42,8 +42,6 @@
 #define SERIAL_NX_MAJOR 204
 #define MINOR_START     170
 
-#ifdef CONFIG_SERIAL_NETX_CONSOLE
-
 enum uart_regs {
         UART_DR              = 0x00,
         UART_SR              = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
         }
 };
 
+#ifdef CONFIG_SERIAL_NETX_CONSOLE
+
 static void netx_console_putchar(struct uart_port *port, int ch)
 {
         while (readl(port->membase + UART_FR) & FR_BUSY);
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index f0658d2c45b2..5c0f32c7fbf6 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -250,8 +250,7 @@ static inline void h8300_sci_disable(struct uart_port *port)
 }
 #endif
 
-#if defined(SCI_ONLY) || defined(SCI_AND_SCIF) && \
-    defined(__H8300H__) || defined(__H8300S__)
+#if defined(__H8300H__) || defined(__H8300S__)
 static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag)
 {
         int ch = (port->mapbase - SMR0) >> 3;
@@ -285,11 +284,6 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 #define sci_init_pins_irda NULL
 #endif
 
-#ifdef SCI_ONLY
-#define sci_init_pins_scif NULL
-#endif
-
-#if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
 #if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
 {
@@ -449,7 +443,6 @@ static inline int scif_rxroom(struct uart_port *port)
         return sci_in(port, SCFDR) & SCIF_RFDC_MASK;
 }
 #endif
-#endif /* SCIF_ONLY || SCI_AND_SCIF */
 
 static inline int sci_txroom(struct uart_port *port)
 {
@@ -485,11 +478,9 @@ static void sci_transmit_chars(struct uart_port *port)
                 return;
         }
 
-#ifndef SCI_ONLY
         if (port->type == PORT_SCIF)
                 count = scif_txroom(port);
         else
-#endif
                 count = sci_txroom(port);
 
         do {
@@ -519,12 +510,10 @@ static void sci_transmit_chars(struct uart_port *port)
         } else {
                 ctrl = sci_in(port, SCSCR);
 
-#if !defined(SCI_ONLY)
                 if (port->type == PORT_SCIF) {
                         sci_in(port, SCxSR); /* Dummy read */
                         sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
                 }
-#endif
 
                 ctrl |= SCI_CTRL_FLAGS_TIE;
                 sci_out(port, SCSCR, ctrl);
@@ -547,11 +536,9 @@ static inline void sci_receive_chars(struct uart_port *port)
                 return;
 
         while (1) {
-#if !defined(SCI_ONLY)
                 if (port->type == PORT_SCIF)
                         count = scif_rxroom(port);
                 else
-#endif
                         count = sci_rxroom(port);
 
                 /* Don't copy more bytes than there is room for in the buffer */
@@ -810,26 +797,27 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr)
 
 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 {
-        unsigned short ssr_status, scr_status;
-        struct uart_port *port = ptr;
+        unsigned short ssr_status, scr_status;
+        struct uart_port *port = ptr;
+        irqreturn_t ret = IRQ_NONE;
 
         ssr_status = sci_in(port,SCxSR);
         scr_status = sci_in(port,SCSCR);
 
         /* Tx Interrupt */
-        if ((ssr_status & 0x0020) && (scr_status & 0x0080))
-                sci_tx_interrupt(irq, ptr);
+        if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE))
+                ret = sci_tx_interrupt(irq, ptr);
         /* Rx Interrupt */
-        if ((ssr_status & 0x0002) && (scr_status & 0x0040))
-                sci_rx_interrupt(irq, ptr);
+        if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE))
+                ret = sci_rx_interrupt(irq, ptr);
         /* Error Interrupt */
-        if ((ssr_status & 0x0080) && (scr_status & 0x0400))
-                sci_er_interrupt(irq, ptr);
+        if ((ssr_status & 0x0080) && (scr_status & SCI_CTRL_FLAGS_REIE))
+                ret = sci_er_interrupt(irq, ptr);
         /* Break Interrupt */
-        if ((ssr_status & 0x0010) && (scr_status & 0x0200))
-                sci_br_interrupt(irq, ptr);
+        if ((ssr_status & 0x0010) && (scr_status & SCI_CTRL_FLAGS_REIE))
+                ret = sci_br_interrupt(irq, ptr);
 
-        return IRQ_HANDLED;
+        return ret;
 }
 
 #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_HAVE_CLK)
@@ -1054,10 +1042,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
 
         sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
 
-#if !defined(SCI_ONLY)
         if (port->type == PORT_SCIF)
                 sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
-#endif
 
         smr_val = sci_in(port, SCSMR) & 3;
         if ((termios->c_cflag & CSIZE) == CS7)
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 7cd28b226800..6163a45f968f 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -16,7 +16,6 @@
 # define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
 # define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_AND_SCIF
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define SCIF0          0xA4400000
 # define SCIF2          0xA4410000
@@ -30,17 +29,15 @@
  * SCIF0 (0xA4400000) -> Internal clock, SCK pin as serial clock output
  */
 # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \
       defined(CONFIG_CPU_SUBTYPE_SH7721)
 # define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCIF_ONLY
 #define SCIF_ORER    0x0200   /* overrun error bit */
 #elif defined(CONFIG_SH_RTS7751R2D)
+# define SCSPTR1 0xFFE0001C /* 8 bit SCIF */
 # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7750)  || \
       defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
       defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
@@ -53,28 +50,24 @@
 # define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \
         0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \
         0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ )
-# define SCI_AND_SCIF
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
 # define SCSPTR0 0xfe600024 /* 16 bit SCIF */
 # define SCSPTR1 0xfe610024 /* 16 bit SCIF */
 # define SCSPTR2 0xfe620024 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)          0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 # define SCSPTR0 0xA4400000       /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define PACR 0xa4050100
 # define PBCR 0xa4050102
 # define SCSCR_INIT(port)          0x3B
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7343)
 # define SCSPTR0 0xffe00010     /* 16 bit SCIF */
 # define SCSPTR1 0xffe10010     /* 16 bit SCIF */
 # define SCSPTR2 0xffe20010     /* 16 bit SCIF */
 # define SCSPTR3 0xffe30010     /* 16 bit SCIF */
 # define SCSCR_INIT(port) 0x32  /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7722)
 # define PADR                   0xA4050120
 # define PSDR                   0xA405013e
@@ -82,7 +75,6 @@
 # define PSCR                   0xA405011E
 # define SCIF_ORER              0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7366)
 # define SCPDR0                 0xA405013E      /* 16 bit SCIF0 PSDR */
 # define SCSPTR0                SCPDR0
@@ -97,12 +89,10 @@
 # define SCSPTR5                0xa4050128
 # define SCIF_ORER              0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
 # define SCSPTR2 0xffe80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
 # define SCIF_BASE_ADDR    0x01030000
 # define SCIF_ADDR_SH5     PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
@@ -111,14 +101,11 @@
 # define SCSPTR2           ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */
 # define SCLSR2            ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */
 # define SCSCR_INIT(port)  0x38         /* TIE=0,RIE=0, TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_H83007) || defined(CONFIG_H83068)
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
 #elif defined(CONFIG_H8S2678)
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 # define SCSPTR0 0xffe00024 /* 16 bit SCIF */
@@ -126,20 +113,17 @@
 # define SCSPTR2 0xffe10020 /* 16 bit SCIF/IRDA */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
 # define SCSPTR0 0xff923020 /* 16 bit SCIF */
 # define SCSPTR1 0xff924020 /* 16 bit SCIF */
 # define SCSPTR2 0xff925020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x3c /* TIE=0,RIE=0,TE=1,RE=1,REIE=1,cke=2 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
 # define SCSPTR0        0xffe00024      /* 16 bit SCIF */
 # define SCSPTR1        0xffe10024      /* 16 bit SCIF */
 # define SCIF_ORER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7785)
 # define SCSPTR0        0xffea0024      /* 16 bit SCIF */
 # define SCSPTR1        0xffeb0024      /* 16 bit SCIF */
@@ -149,7 +133,6 @@
 # define SCSPTR5        0xffef0024      /* 16 bit SCIF */
 # define SCIF_OPER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
       defined(CONFIG_CPU_SUBTYPE_SH7206) || \
       defined(CONFIG_CPU_SUBTYPE_SH7263)
@@ -158,14 +141,12 @@
 # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */
 # define SCSPTR3 0xfffe9820 /* 16 bit SCIF */
 # define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
 # define SCSPTR0 0xf8400020 /* 16 bit SCIF */
 # define SCSPTR1 0xf8410020 /* 16 bit SCIF */
 # define SCSPTR2 0xf8420020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SHX3)
 # define SCSPTR0 0xffc30020             /* 16 bit SCIF */
 # define SCSPTR1 0xffc40020             /* 16 bit SCIF */
@@ -173,7 +154,6 @@
 # define SCSPTR3 0xffc60020             /* 16 bit SCIF */
 # define SCIF_ORER 0x0001               /* Overrun error bit */
 # define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #else
 # error CPU subtype not defined
 #endif
@@ -186,6 +166,7 @@
 #if defined(CONFIG_CPU_SUBTYPE_SH7750)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7722)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
     defined(CONFIG_CPU_SUBTYPE_SH7751)  || \
     defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
@@ -244,55 +225,28 @@
 # define SCIF_TXROOM_MAX 16
 #endif
 
-#if defined(SCI_ONLY)
-# define SCxSR_TEND(port)               SCI_TEND
-# define SCxSR_ERRORS(port)             SCI_ERRORS
-# define SCxSR_RDxF(port)               SCI_RDRF
-# define SCxSR_TDxE(port)               SCI_TDRE
-# define SCxSR_ORER(port)               SCI_ORER
-# define SCxSR_FER(port)                SCI_FER
-# define SCxSR_PER(port)                SCI_PER
-# define SCxSR_BRK(port)                0x00
-# define SCxSR_RDxF_CLEAR(port)         0xbc
-# define SCxSR_ERROR_CLEAR(port)        0xc4
-# define SCxSR_TDxE_CLEAR(port)         0x78
-# define SCxSR_BREAK_CLEAR(port)        0xc4
-#elif defined(SCIF_ONLY)
-# define SCxSR_TEND(port)               SCIF_TEND
-# define SCxSR_ERRORS(port)             SCIF_ERRORS
-# define SCxSR_RDxF(port)               SCIF_RDF
-# define SCxSR_TDxE(port)               SCIF_TDFE
+#define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
+#define SCxSR_ERRORS(port)      (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
+#define SCxSR_RDxF(port)        (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
+#define SCxSR_TDxE(port)        (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
+#define SCxSR_FER(port)         (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
+#define SCxSR_PER(port)         (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
+#define SCxSR_BRK(port)         (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
+
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
-# define SCxSR_ORER(port)               SCIF_ORER
+# define SCxSR_ORER(port)       (((port)->type == PORT_SCI) ? SCI_ORER : SCIF_ORER)
 #else
-# define SCxSR_ORER(port)               0x0000
+# define SCxSR_ORER(port)       (((port)->type == PORT_SCI) ? SCI_ORER : 0x0000)
 #endif
-# define SCxSR_FER(port)                SCIF_FER
-# define SCxSR_PER(port)                SCIF_PER
-# define SCxSR_BRK(port)                SCIF_BRK
+
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
     defined(CONFIG_CPU_SUBTYPE_SH7720) || \
     defined(CONFIG_CPU_SUBTYPE_SH7721)
-# define SCxSR_RDxF_CLEAR(port)         (sci_in(port,SCxSR)&0xfffc)
-# define SCxSR_ERROR_CLEAR(port)        (sci_in(port,SCxSR)&0xfd73)
-# define SCxSR_TDxE_CLEAR(port)         (sci_in(port,SCxSR)&0xffdf)
-# define SCxSR_BREAK_CLEAR(port)        (sci_in(port,SCxSR)&0xffe3)
-#else
-/* SH7705 can also use this, clearing is same between 7705 and 7709 */
-# define SCxSR_RDxF_CLEAR(port)         0x00fc
-# define SCxSR_ERROR_CLEAR(port)        0x0073
-# define SCxSR_TDxE_CLEAR(port)         0x00df
-# define SCxSR_BREAK_CLEAR(port)        0x00e3
-#endif
+# define SCxSR_RDxF_CLEAR(port)  (sci_in(port, SCxSR) & 0xfffc)
+# define SCxSR_ERROR_CLEAR(port) (sci_in(port, SCxSR) & 0xfd73)
+# define SCxSR_TDxE_CLEAR(port)  (sci_in(port, SCxSR) & 0xffdf)
+# define SCxSR_BREAK_CLEAR(port) (sci_in(port, SCxSR) & 0xffe3)
 #else
-# define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
-# define SCxSR_ERRORS(port)      (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
-# define SCxSR_RDxF(port)        (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
-# define SCxSR_TDxE(port)        (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
-# define SCxSR_ORER(port)        (((port)->type == PORT_SCI) ? SCI_ORER   : 0x0000)
-# define SCxSR_FER(port)         (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
-# define SCxSR_PER(port)         (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
-# define SCxSR_BRK(port)         (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
 # define SCxSR_RDxF_CLEAR(port)  (((port)->type == PORT_SCI) ? 0xbc : 0x00fc)
 # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073)
 # define SCxSR_TDxE_CLEAR(port)  (((port)->type == PORT_SCI) ? 0x78 : 0x00df)
@@ -574,18 +528,20 @@ static inline int sci_rxd_in(struct uart_port *port)
       defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
       defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
       defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
-      defined(CONFIG_CPU_SUBTYPE_SH4_202)
+      defined(CONFIG_CPU_SUBTYPE_SH7091)
 static inline int sci_rxd_in(struct uart_port *port)
 {
-#ifndef SCIF_ONLY
         if (port->mapbase == 0xffe00000)
                 return ctrl_inb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */
-#endif
-#ifndef SCI_ONLY
         if (port->mapbase == 0xffe80000)
                 return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
-#endif
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffe80000)
+                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
         return 1;
 }
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
@@ -651,7 +607,7 @@ static inline int sci_rxd_in(struct uart_port *port)
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
 static inline int sci_rxd_in(struct uart_port *port)
 {
-         return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */
+         return sci_in(port, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
 }
 #elif defined(__H8300H__) || defined(__H8300S__)
 static inline int sci_rxd_in(struct uart_port *port)
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 307b1f62d949..b1b947edcf01 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -1,10 +1,11 @@
-menu "Sonics Silicon Backplane"
-
 config SSB_POSSIBLE
         bool
         depends on HAS_IOMEM && HAS_DMA
         default y
 
+menu "Sonics Silicon Backplane"
+        depends on SSB_POSSIBLE
+
 config SSB
         tristate "Sonics Silicon Backplane support"
         depends on SSB_POSSIBLE
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e1654f59eb70..c95b286a1239 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -21,7 +21,23 @@ menuconfig STAGING
 
           If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+        bool "Exclude Staging drivers from being built" if STAGING
+        default y
+        ---help---
+          Are you sure you really want to build the staging drivers?
+          They taint your kernel, don't live up to the normal Linux
+          kernel quality standards, are a bit crufty around the edges,
+          and might go off and kick your dog when you aren't paying
+          attention.
+
+          Say N here to be able to select and build the Staging drivers.
+          This option is primarily here to prevent them from being built
+          when selecting 'make allyesconfg' and 'make allmodconfig' so
+          don't be all that put off, your dog will be just fine.
+
+if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/et131x/Kconfig"
 
@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD
diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c
index b8f2c5e9dee5..fd4007e329e7 100644
--- a/drivers/staging/echo/echo.c
+++ b/drivers/staging/echo/echo.c
@@ -106,7 +106,6 @@
 
 #include <linux/kernel.h>       /* We're doing kernel work */
 #include <linux/module.h>
-#include <linux/kernel.h>
 #include <linux/slab.h>
 
 #include "bit_operations.h"
diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
index 0b33773bb4f6..0394e2709278 100644
--- a/drivers/staging/me4000/me4000.c
+++ b/drivers/staging/me4000/me4000.c
@@ -39,7 +39,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 /* Include-File for the Meilhaus ME-4000 I/O board */
 #include "me4000.h"
@@ -1633,9 +1632,6 @@ static int me4000_release(struct inode *inode_p, struct file *file_p)
 
                 free_irq(ext_int_context->irq, ext_int_context);
 
-                /* Delete the fasync structure and free memory */
-                me4000_ext_int_fasync(0, file_p, 0);
-
                 /* Mark as unused */
                 ext_int_context->in_use = 0;
         } else {
diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 7426235ccc44..217fb7e62c2f 100644
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -1,6 +1,6 @@
 config USB_IP_COMMON
         tristate "USB IP support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        depends on USB && NET && EXPERIMENTAL
         default N
         ---help---
           This enables pushing USB packets over IP to allow remote
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 41b6530b8f25..a913efc69669 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -2328,7 +2328,6 @@ static int ixj_release(struct inode *inode, struct file *file_p)
         j->rec_codec = j->play_codec = 0;
         j->rec_frame_size = j->play_frame_size = 0;
         j->flags.cidsent = j->flags.cidring = 0;
-        ixj_fasync(-1, file_p, 0);      /* remove from list of async notification */
 
         if(j->cardtype == QTI_LINEJACK && !j->readers && !j->writers) {
                 ixj_set_port(j, PORT_PSTN);
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index 37caf4d69037..b52cc830c0b4 100644
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -8,7 +8,7 @@
  *              as published by the Free Software Foundation; either version
  *              2 of the License, or (at your option) any later version.
  *
- * Author:      Alan Cox, <alan@redhat.com>
+ * Author:      Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *
  * Fixes:       Mar 01 2000 Thomas Sparr, <thomas.l.sparr@telia.com>
  *              phone_register_device now works with unit!=PHONE_UNIT_ANY
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index f9b4647255aa..2d2440cd57a9 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -367,9 +367,6 @@ static int uio_release(struct inode *inode, struct file *filep)
                 ret = idev->info->release(idev->info, inode);
 
         module_put(idev->owner);
-
-        if (filep->f_flags & FASYNC)
-                ret = uio_fasync(-1, filep, 0);
         kfree(listener);
         return ret;
 }
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 543811f6e6e8..8e74657f106c 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -133,7 +133,7 @@ static int usbtmc_release(struct inode *inode, struct file *file)
 
 static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
 {
-        char *buffer;
+        u8 *buffer;
         struct device *dev;
         int rv;
         int n;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index fc9018e72a09..e1b42626d04d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -106,6 +106,9 @@ static DEFINE_SPINLOCK(hcd_root_hub_lock);
 /* used when updating an endpoint's URB list */
 static DEFINE_SPINLOCK(hcd_urb_list_lock);
 
+/* used to protect against unlinking URBs after the device is gone */
+static DEFINE_SPINLOCK(hcd_urb_unlink_lock);
+
 /* wait queue for synchronous unlinks */
 DECLARE_WAIT_QUEUE_HEAD(usb_kill_urb_queue);
 
@@ -1376,10 +1379,25 @@ static int unlink1(struct usb_hcd *hcd, struct urb *urb, int status)
 int usb_hcd_unlink_urb (struct urb *urb, int status)
 {
         struct usb_hcd          *hcd;
-        int                     retval;
+        int                     retval = -EIDRM;
+        unsigned long           flags;
 
-        hcd = bus_to_hcd(urb->dev->bus);
-        retval = unlink1(hcd, urb, status);
+        /* Prevent the device and bus from going away while
+         * the unlink is carried out.  If they are already gone
+         * then urb->use_count must be 0, since disconnected
+         * devices can't have any active URBs.
+         */
+        spin_lock_irqsave(&hcd_urb_unlink_lock, flags);
+        if (atomic_read(&urb->use_count) > 0) {
+                retval = 0;
+                usb_get_dev(urb->dev);
+        }
+        spin_unlock_irqrestore(&hcd_urb_unlink_lock, flags);
+        if (retval == 0) {
+                hcd = bus_to_hcd(urb->dev->bus);
+                retval = unlink1(hcd, urb, status);
+                usb_put_dev(urb->dev);
+        }
 
         if (retval == 0)
                 retval = -EINPROGRESS;
@@ -1528,6 +1546,17 @@ void usb_hcd_disable_endpoint(struct usb_device *udev,
                 hcd->driver->endpoint_disable(hcd, ep);
 }
 
+/* Protect against drivers that try to unlink URBs after the device
+ * is gone, by waiting until all unlinks for @udev are finished.
+ * Since we don't currently track URBs by device, simply wait until
+ * nothing is running in the locked region of usb_hcd_unlink_urb().
+ */
+void usb_hcd_synchronize_unlinks(struct usb_device *udev)
+{
+        spin_lock_irq(&hcd_urb_unlink_lock);
+        spin_unlock_irq(&hcd_urb_unlink_lock);
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* called in any context */
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 2dcde61c465e..9465e70f4dd0 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -232,6 +232,7 @@ extern void usb_hcd_flush_endpoint(struct usb_device *udev,
                 struct usb_host_endpoint *ep);
 extern void usb_hcd_disable_endpoint(struct usb_device *udev,
                 struct usb_host_endpoint *ep);
+extern void usb_hcd_synchronize_unlinks(struct usb_device *udev);
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
 
 extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9b3f16bd12cb..b19cbfcd51da 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -659,6 +659,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                         PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
                         schedule_delayed_work(&hub->init_work,
                                         msecs_to_jiffies(delay));
+
+                        /* Suppress autosuspend until init is done */
+                        to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
                         return;         /* Continues at init2: below */
                 } else {
                         hub_power_on(hub, true);
@@ -1429,6 +1432,7 @@ void usb_disconnect(struct usb_device **pdev)
          */
         dev_dbg (&udev->dev, "unregistering device\n");
         usb_disable_device(udev, 0);
+        usb_hcd_synchronize_unlinks(udev);
 
         usb_unlock_device(udev);
 
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index f2638009a464..4342bd9c3bb6 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -474,6 +474,12 @@ EXPORT_SYMBOL_GPL(usb_submit_urb);
  * indicating that the request has been canceled (rather than any other
  * code).
  *
+ * Drivers should not call this routine or related routines, such as
+ * usb_kill_urb() or usb_unlink_anchored_urbs(), after their disconnect
+ * method has returned.  The disconnect function should synchronize with
+ * a driver's I/O routines to insure that all URB-related activity has
+ * completed before it returns.
+ *
  * This request is always asynchronous.  Success is indicated by
  * returning -EINPROGRESS, at which time the URB will probably not yet
  * have been given back to the device driver.  When it is eventually
@@ -550,6 +556,9 @@ EXPORT_SYMBOL_GPL(usb_unlink_urb);
  * This routine may not be used in an interrupt context (such as a bottom
  * half or a completion handler), or when holding a spinlock, or in other
  * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_kill_urb(struct urb *urb)
 {
@@ -588,6 +597,9 @@ EXPORT_SYMBOL_GPL(usb_kill_urb);
  * This routine may not be used in an interrupt context (such as a bottom
  * half or a completion handler), or when holding a spinlock, or in other
  * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_poison_urb(struct urb *urb)
 {
@@ -622,6 +634,9 @@ EXPORT_SYMBOL_GPL(usb_unpoison_urb);
  *
  * this allows all outstanding URBs to be killed starting
  * from the back of the queue
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_kill_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -651,6 +666,9 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
  * this allows all outstanding URBs to be poisoned starting
  * from the back of the queue. Newly added URBs will also be
  * poisoned
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_poison_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -672,6 +690,7 @@ void usb_poison_anchored_urbs(struct usb_anchor *anchor)
         spin_unlock_irq(&anchor->lock);
 }
 EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
+
 /**
  * usb_unlink_anchored_urbs - asynchronously cancel transfer requests en masse
  * @anchor: anchor the requests are bound to
@@ -680,6 +699,9 @@ EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
  * from the back of the queue. This function is asynchronous.
  * The unlinking is just tiggered. It may happen after this
  * function has returned.
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
  */
 void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
 {
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index f4585d3e90d7..eeb26c0f88e5 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1251,7 +1251,6 @@ dev_release (struct inode *inode, struct file *fd)
          * alternatively, all host requests will time out.
          */
 
-        fasync_helper (-1, fd, 0, &dev->fasync);
         kfree (dev->buf);
         dev->buf = NULL;
         put_dev (dev);
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index b679a556b98d..4e2cda93da59 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -26,7 +26,7 @@
  *      Introduced common header to be used also in USB Gadget Framework.
  *      Still needs some other style fixes.
  *
- * 2007_Jun_21  Alan Cox <alan@redhat.com>
+ * 2007_Jun_21  Alan Cox <alan@lxorguk.ukuu.org.uk>
  *      Minimal cleanups for some of the driver problens and tty layer abuse.
  *      Still needs fixing to allow multiple dongles.
  *
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8be3f39891c7..794b5ffe4397 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -281,6 +281,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
                         if (tty->driver_data)
                                 tty->driver_data = NULL;
                         tty_port_tty_set(&port->port, NULL);
+                        tty_kref_put(tty);
                 }
         }
 
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a2b9ebbef38e..fb9e20e624c1 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -333,6 +333,13 @@ UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x0100,
                 "Finecam S5",
                 US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
 
+/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
+UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
+                "Kyocera",
+                "CONTAX SL300R T*",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
+
 /* Reported by Paul Stewart <stewart@wetlogic.net>
  * This entry is needed because the device reports Sub=ff */
 UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0f13448c6f79..3f3ce13fef43 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2083,6 +2083,38 @@ config FB_METRONOME
           controller. The pre-release name for this device was 8track
           and could also have been called by some vendors as PVI-nnnn.
 
+config FB_MB862XX
+        tristate "Fujitsu MB862xx GDC support"
+        depends on FB
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers.
+
+config FB_MB862XX_PCI_GDC
+        bool "Carmine/Coral-P(A) GDC"
+        depends on PCI && FB_MB862XX
+        ---help---
+          This enables framebuffer support for Fujitsu Carmine/Coral-P(A)
+          PCI graphics controller devices.
+
+config FB_MB862XX_LIME
+        bool "Lime GDC"
+        depends on FB_MB862XX
+        depends on OF && !FB_MB862XX_PCI_GDC
+        select FB_FOREIGN_ENDIAN
+        select FB_LITTLE_ENDIAN
+        ---help---
+          Framebuffer support for Fujitsu Lime GDC on host CPU bus.
+
+config FB_PRE_INIT_FB
+        bool "Don't reinitialize, use bootloader's GDC/Display configuration"
+        depends on FB_MB862XX_LIME
+        ---help---
+          Select this option if display contents should be inherited as set by
+          the bootloader.
+
 source "drivers/video/omap/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 248bddc8d0b0..e39e33e797da 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -122,6 +122,7 @@ obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o
 obj-$(CONFIG_FB_OMAP)             += omap/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
 obj-$(CONFIG_FB_CARMINE)          += carminefb.o
+obj-$(CONFIG_FB_MB862XX)          += mb862xx/
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 2afd47eefe74..f8a4bb20f41a 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd)
         return corgi_bl_set_intensity(lcd, intensity);
 }
 
-void corgibl_limit_intensity(int limit)
+void corgi_lcd_limit_intensity(int limit)
 {
         if (limit)
                 corgibl_flags |= CORGIBL_BATTLOW;
@@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit)
 
         backlight_update_status(the_corgi_lcd->bl_dev);
 }
-EXPORT_SYMBOL(corgibl_limit_intensity);
+EXPORT_SYMBOL(corgi_lcd_limit_intensity);
 
 static struct backlight_ops corgi_bl_ops = {
         .get_brightness = corgi_bl_get_intensity,
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 048b139f0e50..8a8760230bc7 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2049,7 +2049,7 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
+static void cirrusfb_zorro_unmap(struct fb_info *info)
 {
         struct cirrusfb_info *cinfo = info->par;
         struct zorro_dev *zdev = to_zorro_dev(info->device);
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 64b3d30027b8..b92947d62ad6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2118,7 +2118,7 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
                    height, width);
 }
 
-static __inline__ void updatescrollmode(struct display *p,
+static void updatescrollmode(struct display *p,
                                         struct fb_info *info,
                                         struct vc_data *vc)
 {
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cd5f20da738a..1d5ae39cb271 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1002,13 +1002,9 @@ fb_blank(struct fb_info *info, int blank)
         return ret;
 }
 
-static long
-fb_ioctl(struct file *file, unsigned int cmd,
-         unsigned long arg)
+static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+                        unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
-        int fbidx = iminor(inode);
-        struct fb_info *info;
         struct fb_ops *fb;
         struct fb_var_screeninfo var;
         struct fb_fix_screeninfo fix;
@@ -1018,14 +1014,10 @@ fb_ioctl(struct file *file, unsigned int cmd,
         void __user *argp = (void __user *)arg;
         long ret = 0;
 
-        info = registered_fb[fbidx];
-        mutex_lock(&info->lock);
         fb = info->fbops;
-
-        if (!fb) {
-                mutex_unlock(&info->lock);
+        if (!fb)
                 return -ENODEV;
-        }
+
         switch (cmd) {
         case FBIOGET_VSCREENINFO:
                 ret = copy_to_user(argp, &info->var,
@@ -1126,6 +1118,21 @@ fb_ioctl(struct file *file, unsigned int cmd,
                 else
                         ret = fb->fb_ioctl(info, cmd, arg);
         }
+        return ret;
+}
+
+static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+__acquires(&info->lock)
+__releases(&info->lock)
+{
+        struct inode *inode = file->f_path.dentry->d_inode;
+        int fbidx = iminor(inode);
+        struct fb_info *info;
+        long ret;
+
+        info = registered_fb[fbidx];
+        mutex_lock(&info->lock);
+        ret = do_fb_ioctl(info, cmd, arg);
         mutex_unlock(&info->lock);
         return ret;
 }
@@ -1157,8 +1164,8 @@ struct fb_cmap32 {
         compat_caddr_t  transp;
 };
 
-static int fb_getput_cmap(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
+static int fb_getput_cmap(struct fb_info *info, unsigned int cmd,
+                          unsigned long arg)
 {
         struct fb_cmap_user __user *cmap;
         struct fb_cmap32 __user *cmap32;
@@ -1181,7 +1188,7 @@ static int fb_getput_cmap(struct inode *inode, struct file *file,
             put_user(compat_ptr(data), &cmap->transp))
                 return -EFAULT;
 
-        err = fb_ioctl(file, cmd, (unsigned long) cmap);
+        err = do_fb_ioctl(info, cmd, (unsigned long) cmap);
 
         if (!err) {
                 if (copy_in_user(&cmap32->start,
@@ -1223,8 +1230,8 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
         return err;
 }
 
-static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
-                                unsigned int cmd, unsigned long arg)
+static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
+                              unsigned long arg)
 {
         mm_segment_t old_fs;
         struct fb_fix_screeninfo fix;
@@ -1235,7 +1242,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
 
         old_fs = get_fs();
         set_fs(KERNEL_DS);
-        err = fb_ioctl(file, cmd, (unsigned long) &fix);
+        err = do_fb_ioctl(info, cmd, (unsigned long) &fix);
         set_fs(old_fs);
 
         if (!err)
@@ -1244,8 +1251,10 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file,
         return err;
 }
 
-static long
-fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long fb_compat_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long arg)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         int fbidx = iminor(inode);
@@ -1262,16 +1271,16 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case FBIOPUT_CON2FBMAP:
                 arg = (unsigned long) compat_ptr(arg);
         case FBIOBLANK:
-                ret = fb_ioctl(file, cmd, arg);
+                ret = do_fb_ioctl(info, cmd, arg);
                 break;
 
         case FBIOGET_FSCREENINFO:
-                ret = fb_get_fscreeninfo(inode, file, cmd, arg);
+                ret = fb_get_fscreeninfo(info, cmd, arg);
                 break;
 
         case FBIOGETCMAP:
         case FBIOPUTCMAP:
-                ret = fb_getput_cmap(inode, file, cmd, arg);
+                ret = fb_getput_cmap(info, cmd, arg);
                 break;
 
         default:
@@ -1286,6 +1295,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
 static int
 fb_mmap(struct file *file, struct vm_area_struct * vma)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         int fbidx = iminor(file->f_path.dentry->d_inode);
         struct fb_info *info = registered_fb[fbidx];
@@ -1339,6 +1350,8 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 
 static int
 fb_open(struct inode *inode, struct file *file)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         int fbidx = iminor(inode);
         struct fb_info *info;
@@ -1374,6 +1387,8 @@ out:
 
 static int 
 fb_release(struct inode *inode, struct file *file)
+__acquires(&info->lock)
+__releases(&info->lock)
 {
         struct fb_info * const info = file->private_data;
 
diff --git a/drivers/video/mb862xx/Makefile b/drivers/video/mb862xx/Makefile
new file mode 100644
index 000000000000..07664814bb1d
--- /dev/null
+++ b/drivers/video/mb862xx/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the MB862xx framebuffer driver
+#
+
+obj-$(CONFIG_FB_MB862XX)        := mb862xxfb.o
diff --git a/drivers/video/mb862xx/mb862xx_reg.h b/drivers/video/mb862xx/mb862xx_reg.h
new file mode 100644
index 000000000000..2ba65e118500
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xx_reg.h
@@ -0,0 +1,138 @@
+/*
+ * Fujitsu MB862xx Graphics Controller Registers/Bits
+ */
+
+#ifndef _MB862XX_REG_H
+#define _MB862XX_REG_H
+
+#ifdef MB862XX_MMIO_BOTTOM
+#define MB862XX_MMIO_BASE       0x03fc0000
+#else
+#define MB862XX_MMIO_BASE       0x01fc0000
+#endif
+#define MB862XX_I2C_BASE        0x0000c000
+#define MB862XX_DISP_BASE       0x00010000
+#define MB862XX_CAP_BASE        0x00018000
+#define MB862XX_DRAW_BASE       0x00030000
+#define MB862XX_GEO_BASE        0x00038000
+#define MB862XX_PIO_BASE        0x00038000
+#define MB862XX_MMIO_SIZE       0x40000
+
+/* Host interface/pio registers */
+#define GC_IST                  0x00000020
+#define GC_IMASK                0x00000024
+#define GC_SRST                 0x0000002c
+#define GC_CCF                  0x00000038
+#define GC_CID                  0x000000f0
+#define GC_REVISION             0x00000084
+
+#define GC_CCF_CGE_100          0x00000000
+#define GC_CCF_CGE_133          0x00040000
+#define GC_CCF_CGE_166          0x00080000
+#define GC_CCF_COT_100          0x00000000
+#define GC_CCF_COT_133          0x00010000
+#define GC_CID_CNAME_MSK        0x0000ff00
+#define GC_CID_VERSION_MSK      0x000000ff
+
+/* define enabled interrupts hereby */
+#define GC_INT_EN               0x00000000
+
+/* Memory interface mode register */
+#define GC_MMR                  0x0000fffc
+
+/* Display Controller registers */
+#define GC_DCM0                 0x00000000
+#define GC_HTP                  0x00000004
+#define GC_HDB_HDP              0x00000008
+#define GC_VSW_HSW_HSP          0x0000000c
+#define GC_VTR                  0x00000010
+#define GC_VDP_VSP              0x00000014
+#define GC_WY_WX                0x00000018
+#define GC_WH_WW                0x0000001c
+#define GC_L0M                  0x00000020
+#define GC_L0OA0                0x00000024
+#define GC_L0DA0                0x00000028
+#define GC_L0DY_L0DX            0x0000002c
+#define GC_DCM1                 0x00000100
+#define GC_L0EM                 0x00000110
+#define GC_L0WY_L0WX            0x00000114
+#define GC_L0WH_L0WW            0x00000118
+#define GC_DCM2                 0x00000104
+#define GC_DCM3                 0x00000108
+#define GC_CPM_CUTC             0x000000a0
+#define GC_CUOA0                0x000000a4
+#define GC_CUY0_CUX0            0x000000a8
+#define GC_CUOA1                0x000000ac
+#define GC_CUY1_CUX1            0x000000b0
+#define GC_L0PAL0               0x00000400
+
+#define GC_CPM_CEN0             0x00100000
+#define GC_CPM_CEN1             0x00200000
+
+#define GC_DCM01_ESY            0x00000004
+#define GC_DCM01_SC             0x00003f00
+#define GC_DCM01_RESV           0x00004000
+#define GC_DCM01_CKS            0x00008000
+#define GC_DCM01_L0E            0x00010000
+#define GC_DCM01_DEN            0x80000000
+#define GC_L0M_L0C_8            0x00000000
+#define GC_L0M_L0C_16           0x80000000
+#define GC_L0EM_L0EC_24         0x40000000
+#define GC_L0M_L0W_UNIT         64
+
+#define GC_DISP_REFCLK_400      400
+
+/* Carmine specific */
+#define MB86297_DRAW_BASE               0x00020000
+#define MB86297_DISP0_BASE              0x00100000
+#define MB86297_DISP1_BASE              0x00140000
+#define MB86297_WRBACK_BASE             0x00180000
+#define MB86297_CAP0_BASE               0x00200000
+#define MB86297_CAP1_BASE               0x00280000
+#define MB86297_DRAMCTRL_BASE           0x00300000
+#define MB86297_CTRL_BASE               0x00400000
+#define MB86297_I2C_BASE                0x00500000
+
+#define GC_CTRL_STATUS                  0x00000000
+#define GC_CTRL_INT_MASK                0x00000004
+#define GC_CTRL_CLK_ENABLE              0x0000000c
+#define GC_CTRL_SOFT_RST                0x00000010
+
+#define GC_CTRL_CLK_EN_DRAM             0x00000001
+#define GC_CTRL_CLK_EN_2D3D             0x00000002
+#define GC_CTRL_CLK_EN_DISP0            0x00000020
+#define GC_CTRL_CLK_EN_DISP1            0x00000040
+
+#define GC_2D3D_REV                     0x000004b4
+#define GC_RE_REVISION                  0x24240200
+
+/* define enabled interrupts hereby */
+#define GC_CARMINE_INT_EN               0x00000004
+
+/* DRAM controller */
+#define GC_DCTL_MODE_ADD                0x00000000
+#define GC_DCTL_SETTIME1_EMODE          0x00000004
+#define GC_DCTL_REFRESH_SETTIME2        0x00000008
+#define GC_DCTL_RSV0_STATES             0x0000000C
+#define GC_DCTL_RSV2_RSV1               0x00000010
+#define GC_DCTL_DDRIF2_DDRIF1           0x00000014
+#define GC_DCTL_IOCONT1_IOCONT0         0x00000024
+
+#define GC_DCTL_STATES_MSK              0x0000000f
+#define GC_DCTL_INIT_WAIT_CNT           3000
+#define GC_DCTL_INIT_WAIT_INTERVAL      1
+
+/* DRAM ctrl values for Carmine PCI Eval. board */
+#define GC_EVB_DCTL_MODE_ADD            0x012105c3
+#define GC_EVB_DCTL_MODE_ADD_AFT_RST    0x002105c3
+#define GC_EVB_DCTL_SETTIME1_EMODE      0x47498000
+#define GC_EVB_DCTL_REFRESH_SETTIME2    0x00422a22
+#define GC_EVB_DCTL_RSV0_STATES         0x00200003
+#define GC_EVB_DCTL_RSV0_STATES_AFT_RST 0x00200002
+#define GC_EVB_DCTL_RSV2_RSV1           0x0000000f
+#define GC_EVB_DCTL_DDRIF2_DDRIF1       0x00556646
+#define GC_EVB_DCTL_IOCONT1_IOCONT0     0x05550555
+
+#define GC_DISP_REFCLK_533              533
+
+#endif
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c
new file mode 100644
index 000000000000..38718d95fbb9
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -0,0 +1,1061 @@
+/*
+ * drivers/mb862xx/mb862xxfb.c
+ *
+ * Fujitsu Carmine/Coral-P(A)/Lime framebuffer driver
+ *
+ * (C) 2008 Anatolij Gustschin <agust@denx.de>
+ * DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#undef DEBUG
+
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#if defined(CONFIG_PPC_OF)
+#include <linux/of_platform.h>
+#endif
+#include "mb862xxfb.h"
+#include "mb862xx_reg.h"
+
+#define NR_PALETTE              256
+#define MB862XX_MEM_SIZE        0x1000000
+#define CORALP_MEM_SIZE         0x4000000
+#define CARMINE_MEM_SIZE        0x8000000
+#define DRV_NAME                "mb862xxfb"
+
+#if defined(CONFIG_LWMON5)
+static struct mb862xx_gc_mode lwmon5_gc_mode = {
+        /* Mode for Sharp LQ104V1DG61 TFT LCD Panel */
+        { "640x480", 60, 640, 480, 40000, 48, 16, 32, 11, 96, 2, 0, 0, 0 },
+        /* 16 bits/pixel, 32MB, 100MHz, SDRAM memory mode value */
+        16, 0x2000000, GC_CCF_COT_100, 0x414fb7f2
+};
+#endif
+
+#if defined(CONFIG_SOCRATES)
+static struct mb862xx_gc_mode socrates_gc_mode = {
+        /* Mode for Prime View PM070WL4 TFT LCD Panel */
+        { "800x480", 45, 800, 480, 40000, 86, 42, 33, 10, 128, 2, 0, 0, 0 },
+        /* 16 bits/pixel, 16MB, 133MHz, SDRAM memory mode value */
+        16, 0x1000000, GC_CCF_COT_133, 0x4157ba63
+};
+#endif
+
+/* Helpers */
+static inline int h_total(struct fb_var_screeninfo *var)
+{
+        return var->xres + var->left_margin +
+                var->right_margin + var->hsync_len;
+}
+
+static inline int v_total(struct fb_var_screeninfo *var)
+{
+        return var->yres + var->upper_margin +
+                var->lower_margin + var->vsync_len;
+}
+
+static inline int hsp(struct fb_var_screeninfo *var)
+{
+        return var->xres + var->right_margin - 1;
+}
+
+static inline int vsp(struct fb_var_screeninfo *var)
+{
+        return var->yres + var->lower_margin - 1;
+}
+
+static inline int d_pitch(struct fb_var_screeninfo *var)
+{
+        return var->xres * var->bits_per_pixel / 8;
+}
+
+static inline unsigned int chan_to_field(unsigned int chan,
+                                         struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+static int mb862xxfb_setcolreg(unsigned regno,
+                               unsigned red, unsigned green, unsigned blue,
+                               unsigned transp, struct fb_info *info)
+{
+        struct mb862xxfb_par *par = info->par;
+        unsigned int val;
+
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                if (regno < 16) {
+                        val  = chan_to_field(red,   &info->var.red);
+                        val |= chan_to_field(green, &info->var.green);
+                        val |= chan_to_field(blue,  &info->var.blue);
+                        par->pseudo_palette[regno] = val;
+                }
+                break;
+        case FB_VISUAL_PSEUDOCOLOR:
+                if (regno < 256) {
+                        val = (red >> 8) << 16;
+                        val |= (green >> 8) << 8;
+                        val |= blue >> 8;
+                        outreg(disp, GC_L0PAL0 + (regno * 4), val);
+                }
+                break;
+        default:
+                return 1;   /* unsupported type */
+        }
+        return 0;
+}
+
+static int mb862xxfb_check_var(struct fb_var_screeninfo *var,
+                               struct fb_info *fbi)
+{
+        unsigned long tmp;
+
+        if (fbi->dev)
+                dev_dbg(fbi->dev, "%s\n", __func__);
+
+        /* check if these values fit into the registers */
+        if (var->hsync_len > 255 || var->vsync_len > 255)
+                return -EINVAL;
+
+        if ((var->xres + var->right_margin) >= 4096)
+                return -EINVAL;
+
+        if ((var->yres + var->lower_margin) > 4096)
+                return -EINVAL;
+
+        if (h_total(var) > 4096 || v_total(var) > 4096)
+                return -EINVAL;
+
+        if (var->xres_virtual > 4096 || var->yres_virtual > 4096)
+                return -EINVAL;
+
+        if (var->bits_per_pixel <= 8)
+                var->bits_per_pixel = 8;
+        else if (var->bits_per_pixel <= 16)
+                var->bits_per_pixel = 16;
+        else if (var->bits_per_pixel <= 32)
+                var->bits_per_pixel = 32;
+
+        /*
+         * can cope with 8,16 or 24/32bpp if resulting
+         * pitch is divisible by 64 without remainder
+         */
+        if (d_pitch(&fbi->var) % GC_L0M_L0W_UNIT) {
+                int r;
+
+                var->bits_per_pixel = 0;
+                do {
+                        var->bits_per_pixel += 8;
+                        r = d_pitch(&fbi->var) % GC_L0M_L0W_UNIT;
+                } while (r && var->bits_per_pixel <= 32);
+
+                if (d_pitch(&fbi->var) % GC_L0M_L0W_UNIT)
+                        return -EINVAL;
+        }
+
+        /* line length is going to be 128 bit aligned */
+        tmp = (var->xres * var->bits_per_pixel) / 8;
+        if ((tmp & 15) != 0)
+                return -EINVAL;
+
+        /* set r/g/b positions and validate bpp */
+        switch (var->bits_per_pixel) {
+        case 8:
+                var->red.length         = var->bits_per_pixel;
+                var->green.length       = var->bits_per_pixel;
+                var->blue.length        = var->bits_per_pixel;
+                var->red.offset         = 0;
+                var->green.offset       = 0;
+                var->blue.offset        = 0;
+                var->transp.length      = 0;
+                break;
+        case 16:
+                var->red.length         = 5;
+                var->green.length       = 5;
+                var->blue.length        = 5;
+                var->red.offset         = 10;
+                var->green.offset       = 5;
+                var->blue.offset        = 0;
+                var->transp.length      = 0;
+                break;
+        case 24:
+        case 32:
+                var->transp.length      = 8;
+                var->red.length         = 8;
+                var->green.length       = 8;
+                var->blue.length        = 8;
+                var->transp.offset      = 24;
+                var->red.offset         = 16;
+                var->green.offset       = 8;
+                var->blue.offset        = 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+/*
+ * set display parameters
+ */
+static int mb862xxfb_set_par(struct fb_info *fbi)
+{
+        struct mb862xxfb_par *par = fbi->par;
+        unsigned long reg, sc;
+
+        dev_dbg(par->dev, "%s\n", __func__);
+
+        if (par->pre_init)
+                return 0;
+
+        /* disp off */
+        reg = inreg(disp, GC_DCM1);
+        reg &= ~GC_DCM01_DEN;
+        outreg(disp, GC_DCM1, reg);
+
+        /* set display reference clock div. */
+        sc = par->refclk / (1000000 / fbi->var.pixclock) - 1;
+        reg = inreg(disp, GC_DCM1);
+        reg &= ~(GC_DCM01_CKS | GC_DCM01_RESV | GC_DCM01_SC);
+        reg |= sc << 8;
+        outreg(disp, GC_DCM1, reg);
+        dev_dbg(par->dev, "SC 0x%lx\n", sc);
+
+        /* disp dimension, format */
+        reg =  pack(d_pitch(&fbi->var) / GC_L0M_L0W_UNIT,
+                    (fbi->var.yres - 1));
+        if (fbi->var.bits_per_pixel == 16)
+                reg |= GC_L0M_L0C_16;
+        outreg(disp, GC_L0M, reg);
+
+        if (fbi->var.bits_per_pixel == 32) {
+                reg = inreg(disp, GC_L0EM);
+                outreg(disp, GC_L0EM, reg | GC_L0EM_L0EC_24);
+        }
+        outreg(disp, GC_WY_WX, 0);
+        reg = pack(fbi->var.yres - 1, fbi->var.xres);
+        outreg(disp, GC_WH_WW, reg);
+        outreg(disp, GC_L0OA0, 0);
+        outreg(disp, GC_L0DA0, 0);
+        outreg(disp, GC_L0DY_L0DX, 0);
+        outreg(disp, GC_L0WY_L0WX, 0);
+        outreg(disp, GC_L0WH_L0WW, reg);
+
+        /* both HW-cursors off */
+        reg = inreg(disp, GC_CPM_CUTC);
+        reg &= ~(GC_CPM_CEN0 | GC_CPM_CEN1);
+        outreg(disp, GC_CPM_CUTC, reg);
+
+        /* timings */
+        reg = pack(fbi->var.xres - 1, fbi->var.xres - 1);
+        outreg(disp, GC_HDB_HDP, reg);
+        reg = pack((fbi->var.yres - 1), vsp(&fbi->var));
+        outreg(disp, GC_VDP_VSP, reg);
+        reg = ((fbi->var.vsync_len - 1) << 24) |
+              pack((fbi->var.hsync_len - 1), hsp(&fbi->var));
+        outreg(disp, GC_VSW_HSW_HSP, reg);
+        outreg(disp, GC_HTP, pack(h_total(&fbi->var) - 1, 0));
+        outreg(disp, GC_VTR, pack(v_total(&fbi->var) - 1, 0));
+
+        /* display on */
+        reg = inreg(disp, GC_DCM1);
+        reg |= GC_DCM01_DEN | GC_DCM01_L0E;
+        reg &= ~GC_DCM01_ESY;
+        outreg(disp, GC_DCM1, reg);
+        return 0;
+}
+
+static int mb862xxfb_pan(struct fb_var_screeninfo *var,
+                         struct fb_info *info)
+{
+        struct mb862xxfb_par *par = info->par;
+        unsigned long reg;
+
+        reg = pack(var->yoffset, var->xoffset);
+        outreg(disp, GC_L0WY_L0WX, reg);
+
+        reg = pack(var->yres_virtual, var->xres_virtual);
+        outreg(disp, GC_L0WH_L0WW, reg);
+        return 0;
+}
+
+static int mb862xxfb_blank(int mode, struct fb_info *fbi)
+{
+        struct mb862xxfb_par  *par = fbi->par;
+        unsigned long reg;
+
+        dev_dbg(fbi->dev, "blank mode=%d\n", mode);
+
+        switch (mode) {
+        case FB_BLANK_POWERDOWN:
+                reg = inreg(disp, GC_DCM1);
+                reg &= ~GC_DCM01_DEN;
+                outreg(disp, GC_DCM1, reg);
+                break;
+        case FB_BLANK_UNBLANK:
+                reg = inreg(disp, GC_DCM1);
+                reg |= GC_DCM01_DEN;
+                outreg(disp, GC_DCM1, reg);
+                break;
+        case FB_BLANK_NORMAL:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        default:
+                return 1;
+        }
+        return 0;
+}
+
+/* framebuffer ops */
+static struct fb_ops mb862xxfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_check_var   = mb862xxfb_check_var,
+        .fb_set_par     = mb862xxfb_set_par,
+        .fb_setcolreg   = mb862xxfb_setcolreg,
+        .fb_blank       = mb862xxfb_blank,
+        .fb_pan_display = mb862xxfb_pan,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+/* initialize fb_info data */
+static int mb862xxfb_init_fbinfo(struct fb_info *fbi)
+{
+        struct mb862xxfb_par *par = fbi->par;
+        struct mb862xx_gc_mode *mode = par->gc_mode;
+        unsigned long reg;
+
+        fbi->fbops = &mb862xxfb_ops;
+        fbi->pseudo_palette = par->pseudo_palette;
+        fbi->screen_base = par->fb_base;
+        fbi->screen_size = par->mapped_vram;
+
+        strcpy(fbi->fix.id, DRV_NAME);
+        fbi->fix.smem_start = (unsigned long)par->fb_base_phys;
+        fbi->fix.smem_len = par->mapped_vram;
+        fbi->fix.mmio_start = (unsigned long)par->mmio_base_phys;
+        fbi->fix.mmio_len = par->mmio_len;
+        fbi->fix.accel = FB_ACCEL_NONE;
+        fbi->fix.type = FB_TYPE_PACKED_PIXELS;
+        fbi->fix.type_aux = 0;
+        fbi->fix.xpanstep = 1;
+        fbi->fix.ypanstep = 1;
+        fbi->fix.ywrapstep = 0;
+
+        reg = inreg(disp, GC_DCM1);
+        if (reg & GC_DCM01_DEN && reg & GC_DCM01_L0E) {
+                /* get the disp mode from active display cfg */
+                unsigned long sc = ((reg & GC_DCM01_SC) >> 8) + 1;
+                unsigned long hsp, vsp, ht, vt;
+
+                dev_dbg(par->dev, "using bootloader's disp. mode\n");
+                fbi->var.pixclock = (sc * 1000000) / par->refclk;
+                fbi->var.xres = (inreg(disp, GC_HDB_HDP) & 0x0fff) + 1;
+                reg = inreg(disp, GC_VDP_VSP);
+                fbi->var.yres = ((reg >> 16) & 0x0fff) + 1;
+                vsp = (reg & 0x0fff) + 1;
+                fbi->var.xres_virtual = fbi->var.xres;
+                fbi->var.yres_virtual = fbi->var.yres;
+                reg = inreg(disp, GC_L0EM);
+                if (reg & GC_L0EM_L0EC_24) {
+                        fbi->var.bits_per_pixel = 32;
+                } else {
+                        reg = inreg(disp, GC_L0M);
+                        if (reg & GC_L0M_L0C_16)
+                                fbi->var.bits_per_pixel = 16;
+                        else
+                                fbi->var.bits_per_pixel = 8;
+                }
+                reg = inreg(disp, GC_VSW_HSW_HSP);
+                fbi->var.hsync_len = ((reg & 0xff0000) >> 16) + 1;
+                fbi->var.vsync_len = ((reg & 0x3f000000) >> 24) + 1;
+                hsp = (reg & 0xffff) + 1;
+                ht = ((inreg(disp, GC_HTP) & 0xfff0000) >> 16) + 1;
+                fbi->var.right_margin = hsp - fbi->var.xres;
+                fbi->var.left_margin = ht - hsp - fbi->var.hsync_len;
+                vt = ((inreg(disp, GC_VTR) & 0xfff0000) >> 16) + 1;
+                fbi->var.lower_margin = vsp - fbi->var.yres;
+                fbi->var.upper_margin = vt - vsp - fbi->var.vsync_len;
+        } else if (mode) {
+                dev_dbg(par->dev, "using supplied mode\n");
+                fb_videomode_to_var(&fbi->var, (struct fb_videomode *)mode);
+                fbi->var.bits_per_pixel = mode->def_bpp ? mode->def_bpp : 8;
+        } else {
+                int ret;
+
+                ret = fb_find_mode(&fbi->var, fbi, "640x480-16@60",
+                                   NULL, 0, NULL, 16);
+                if (ret == 0 || ret == 4) {
+                        dev_err(par->dev,
+                                "failed to get initial mode\n");
+                        return -EINVAL;
+                }
+        }
+
+        fbi->var.xoffset = 0;
+        fbi->var.yoffset = 0;
+        fbi->var.grayscale = 0;
+        fbi->var.nonstd = 0;
+        fbi->var.height = -1;
+        fbi->var.width = -1;
+        fbi->var.accel_flags = 0;
+        fbi->var.vmode = FB_VMODE_NONINTERLACED;
+        fbi->var.activate = FB_ACTIVATE_NOW;
+        fbi->flags = FBINFO_DEFAULT |
+#ifdef __BIG_ENDIAN
+                     FBINFO_FOREIGN_ENDIAN |
+#endif
+                     FBINFO_HWACCEL_XPAN |
+                     FBINFO_HWACCEL_YPAN;
+
+        /* check and possibly fix bpp */
+        if ((fbi->fbops->fb_check_var)(&fbi->var, fbi))
+                dev_err(par->dev, "check_var() failed on initial setup?\n");
+
+        fbi->fix.visual = fbi->var.bits_per_pixel == 8 ?
+                         FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
+        fbi->fix.line_length = (fbi->var.xres_virtual *
+                                fbi->var.bits_per_pixel) / 8;
+        return 0;
+}
+
+/*
+ * show some display controller and cursor registers
+ */
+static ssize_t mb862xxfb_show_dispregs(struct device *dev,
+                                       struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct mb862xxfb_par *par = fbi->par;
+        char *ptr = buf;
+        unsigned int reg;
+
+        for (reg = GC_DCM0; reg <= GC_L0DY_L0DX; reg += 4)
+                ptr += sprintf(ptr, "%08x = %08x\n",
+                               reg, inreg(disp, reg));
+
+        for (reg = GC_CPM_CUTC; reg <= GC_CUY1_CUX1; reg += 4)
+                ptr += sprintf(ptr, "%08x = %08x\n",
+                               reg, inreg(disp, reg));
+
+        for (reg = GC_DCM1; reg <= GC_L0WH_L0WW; reg += 4)
+                ptr += sprintf(ptr, "%08x = %08x\n",
+                               reg, inreg(disp, reg));
+
+        return ptr - buf;
+}
+
+static DEVICE_ATTR(dispregs, 0444, mb862xxfb_show_dispregs, NULL);
+
+irqreturn_t mb862xx_intr(int irq, void *dev_id)
+{
+        struct mb862xxfb_par *par = (struct mb862xxfb_par *) dev_id;
+        unsigned long reg_ist, mask;
+
+        if (!par)
+                return IRQ_NONE;
+
+        if (par->type == BT_CARMINE) {
+                /* Get Interrupt Status */
+                reg_ist = inreg(ctrl, GC_CTRL_STATUS);
+                mask = inreg(ctrl, GC_CTRL_INT_MASK);
+                if (reg_ist == 0)
+                        return IRQ_HANDLED;
+
+                reg_ist &= mask;
+                if (reg_ist == 0)
+                        return IRQ_HANDLED;
+
+                /* Clear interrupt status */
+                outreg(ctrl, 0x0, reg_ist);
+        } else {
+                /* Get status */
+                reg_ist = inreg(host, GC_IST);
+                mask = inreg(host, GC_IMASK);
+
+                reg_ist &= mask;
+                if (reg_ist == 0)
+                        return IRQ_HANDLED;
+
+                /* Clear status */
+                outreg(host, GC_IST, ~reg_ist);
+        }
+        return IRQ_HANDLED;
+}
+
+#if defined(CONFIG_FB_MB862XX_LIME)
+/*
+ * GDC (Lime, Coral(B/Q), Mint, ...) on host bus
+ */
+static int mb862xx_gdc_init(struct mb862xxfb_par *par)
+{
+        unsigned long ccf, mmr;
+        unsigned long ver, rev;
+
+        if (!par)
+                return -ENODEV;
+
+#if defined(CONFIG_FB_PRE_INIT_FB)
+        par->pre_init = 1;
+#endif
+        par->host = par->mmio_base;
+        par->i2c = par->mmio_base + MB862XX_I2C_BASE;
+        par->disp = par->mmio_base + MB862XX_DISP_BASE;
+        par->cap = par->mmio_base + MB862XX_CAP_BASE;
+        par->draw = par->mmio_base + MB862XX_DRAW_BASE;
+        par->geo = par->mmio_base + MB862XX_GEO_BASE;
+        par->pio = par->mmio_base + MB862XX_PIO_BASE;
+
+        par->refclk = GC_DISP_REFCLK_400;
+
+        ver = inreg(host, GC_CID);
+        rev = inreg(pio, GC_REVISION);
+        if ((ver == 0x303) && (rev & 0xffffff00) == 0x20050100) {
+                dev_info(par->dev, "Fujitsu Lime v1.%d found\n",
+                         (int)rev & 0xff);
+                par->type = BT_LIME;
+                ccf = par->gc_mode ? par->gc_mode->ccf : GC_CCF_COT_100;
+                mmr = par->gc_mode ? par->gc_mode->mmr : 0x414fb7f2;
+        } else {
+                dev_info(par->dev, "? GDC, CID/Rev.: 0x%lx/0x%lx \n", ver, rev);
+                return -ENODEV;
+        }
+
+        if (!par->pre_init) {
+                outreg(host, GC_CCF, ccf);
+                udelay(200);
+                outreg(host, GC_MMR, mmr);
+                udelay(10);
+        }
+
+        /* interrupt status */
+        outreg(host, GC_IST, 0);
+        outreg(host, GC_IMASK, GC_INT_EN);
+        return 0;
+}
+
+static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev,
+                                               const struct of_device_id *id)
+{
+        struct device_node *np = ofdev->node;
+        struct device *dev = &ofdev->dev;
+        struct mb862xxfb_par *par;
+        struct fb_info *info;
+        struct resource res;
+        resource_size_t res_size;
+        unsigned long ret = -ENODEV;
+
+        if (of_address_to_resource(np, 0, &res)) {
+                dev_err(dev, "Invalid address\n");
+                return -ENXIO;
+        }
+
+        info = framebuffer_alloc(sizeof(struct mb862xxfb_par), dev);
+        if (info == NULL) {
+                dev_err(dev, "cannot allocate framebuffer\n");
+                return -ENOMEM;
+        }
+
+        par = info->par;
+        par->info = info;
+        par->dev = dev;
+
+        par->irq = irq_of_parse_and_map(np, 0);
+        if (par->irq == NO_IRQ) {
+                dev_err(dev, "failed to map irq\n");
+                ret = -ENODEV;
+                goto fbrel;
+        }
+
+        res_size = 1 + res.end - res.start;
+        par->res = request_mem_region(res.start, res_size, DRV_NAME);
+        if (par->res == NULL) {
+                dev_err(dev, "Cannot claim framebuffer/mmio\n");
+                ret = -ENXIO;
+                goto irqdisp;
+        }
+
+#if defined(CONFIG_LWMON5)
+        par->gc_mode = &lwmon5_gc_mode;
+#endif
+
+#if defined(CONFIG_SOCRATES)
+        par->gc_mode = &socrates_gc_mode;
+#endif
+
+        par->fb_base_phys = res.start;
+        par->mmio_base_phys = res.start + MB862XX_MMIO_BASE;
+        par->mmio_len = MB862XX_MMIO_SIZE;
+        if (par->gc_mode)
+                par->mapped_vram = par->gc_mode->max_vram;
+        else
+                par->mapped_vram = MB862XX_MEM_SIZE;
+
+        par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram);
+        if (par->fb_base == NULL) {
+                dev_err(dev, "Cannot map framebuffer\n");
+                goto rel_reg;
+        }
+
+        par->mmio_base = ioremap(par->mmio_base_phys, par->mmio_len);
+        if (par->mmio_base == NULL) {
+                dev_err(dev, "Cannot map registers\n");
+                goto fb_unmap;
+        }
+
+        dev_dbg(dev, "fb phys 0x%llx 0x%lx\n",
+                (u64)par->fb_base_phys, (ulong)par->mapped_vram);
+        dev_dbg(dev, "mmio phys 0x%llx 0x%lx, (irq = %d)\n",
+                (u64)par->mmio_base_phys, (ulong)par->mmio_len, par->irq);
+
+        if (mb862xx_gdc_init(par))
+                goto io_unmap;
+
+        if (request_irq(par->irq, mb862xx_intr, IRQF_DISABLED,
+                        DRV_NAME, (void *)par)) {
+                dev_err(dev, "Cannot request irq\n");
+                goto io_unmap;
+        }
+
+        mb862xxfb_init_fbinfo(info);
+
+        if (fb_alloc_cmap(&info->cmap, NR_PALETTE, 0) < 0) {
+                dev_err(dev, "Could not allocate cmap for fb_info.\n");
+                goto free_irq;
+        }
+
+        if ((info->fbops->fb_set_par)(info))
+                dev_err(dev, "set_var() failed on initial setup?\n");
+
+        if (register_framebuffer(info)) {
+                dev_err(dev, "failed to register framebuffer\n");
+                goto rel_cmap;
+        }
+
+        dev_set_drvdata(dev, info);
+
+        if (device_create_file(dev, &dev_attr_dispregs))
+                dev_err(dev, "Can't create sysfs regdump file\n");
+        return 0;
+
+rel_cmap:
+        fb_dealloc_cmap(&info->cmap);
+free_irq:
+        outreg(host, GC_IMASK, 0);
+        free_irq(par->irq, (void *)par);
+io_unmap:
+        iounmap(par->mmio_base);
+fb_unmap:
+        iounmap(par->fb_base);
+rel_reg:
+        release_mem_region(res.start, res_size);
+irqdisp:
+        irq_dispose_mapping(par->irq);
+fbrel:
+        dev_set_drvdata(dev, NULL);
+        framebuffer_release(info);
+        return ret;
+}
+
+static int __devexit of_platform_mb862xx_remove(struct of_device *ofdev)
+{
+        struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
+        struct mb862xxfb_par *par = fbi->par;
+        resource_size_t res_size = 1 + par->res->end - par->res->start;
+        unsigned long reg;
+
+        dev_dbg(fbi->dev, "%s release\n", fbi->fix.id);
+
+        /* display off */
+        reg = inreg(disp, GC_DCM1);
+        reg &= ~(GC_DCM01_DEN | GC_DCM01_L0E);
+        outreg(disp, GC_DCM1, reg);
+
+        /* disable interrupts */
+        outreg(host, GC_IMASK, 0);
+
+        free_irq(par->irq, (void *)par);
+        irq_dispose_mapping(par->irq);
+
+        device_remove_file(&ofdev->dev, &dev_attr_dispregs);
+
+        unregister_framebuffer(fbi);
+        fb_dealloc_cmap(&fbi->cmap);
+
+        iounmap(par->mmio_base);
+        iounmap(par->fb_base);
+
+        dev_set_drvdata(&ofdev->dev, NULL);
+        release_mem_region(par->res->start, res_size);
+        framebuffer_release(fbi);
+        return 0;
+}
+
+/*
+ * common types
+ */
+static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = {
+        { .compatible = "fujitsu,MB86276", },
+        { .compatible = "fujitsu,lime", },
+        { .compatible = "fujitsu,MB86277", },
+        { .compatible = "fujitsu,mint", },
+        { .compatible = "fujitsu,MB86293", },
+        { .compatible = "fujitsu,MB86294", },
+        { .compatible = "fujitsu,coral", },
+        { /* end */ }
+};
+
+static struct of_platform_driver of_platform_mb862xxfb_driver = {
+        .owner          = THIS_MODULE,
+        .name           = DRV_NAME,
+        .match_table    = of_platform_mb862xx_tbl,
+        .probe          = of_platform_mb862xx_probe,
+        .remove         = __devexit_p(of_platform_mb862xx_remove),
+};
+#endif
+
+#if defined(CONFIG_FB_MB862XX_PCI_GDC)
+static int coralp_init(struct mb862xxfb_par *par)
+{
+        int cn, ver;
+
+        par->host = par->mmio_base;
+        par->i2c = par->mmio_base + MB862XX_I2C_BASE;
+        par->disp = par->mmio_base + MB862XX_DISP_BASE;
+        par->cap = par->mmio_base + MB862XX_CAP_BASE;
+        par->draw = par->mmio_base + MB862XX_DRAW_BASE;
+        par->geo = par->mmio_base + MB862XX_GEO_BASE;
+        par->pio = par->mmio_base + MB862XX_PIO_BASE;
+
+        par->refclk = GC_DISP_REFCLK_400;
+
+        ver = inreg(host, GC_CID);
+        cn = (ver & GC_CID_CNAME_MSK) >> 8;
+        ver = ver & GC_CID_VERSION_MSK;
+        if (cn == 3) {
+                dev_info(par->dev, "Fujitsu Coral-%s GDC Rev.%d found\n",\
+                         (ver == 6) ? "P" : (ver == 8) ? "PA" : "?",
+                         par->pdev->revision);
+                outreg(host, GC_CCF, GC_CCF_CGE_166 | GC_CCF_COT_133);
+                udelay(200);
+                outreg(host, GC_MMR, GC_MMR_CORALP_EVB_VAL);
+                udelay(10);
+                /* Clear interrupt status */
+                outreg(host, GC_IST, 0);
+        } else {
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static int init_dram_ctrl(struct mb862xxfb_par *par)
+{
+        unsigned long i = 0;
+
+        /*
+         * Set io mode first! Spec. says IC may be destroyed
+         * if not set to SSTL2/LVCMOS before init.
+         */
+        outreg(dram_ctrl, GC_DCTL_IOCONT1_IOCONT0, GC_EVB_DCTL_IOCONT1_IOCONT0);
+
+        /* DRAM init */
+        outreg(dram_ctrl, GC_DCTL_MODE_ADD, GC_EVB_DCTL_MODE_ADD);
+        outreg(dram_ctrl, GC_DCTL_SETTIME1_EMODE, GC_EVB_DCTL_SETTIME1_EMODE);
+        outreg(dram_ctrl, GC_DCTL_REFRESH_SETTIME2,
+               GC_EVB_DCTL_REFRESH_SETTIME2);
+        outreg(dram_ctrl, GC_DCTL_RSV2_RSV1, GC_EVB_DCTL_RSV2_RSV1);
+        outreg(dram_ctrl, GC_DCTL_DDRIF2_DDRIF1, GC_EVB_DCTL_DDRIF2_DDRIF1);
+        outreg(dram_ctrl, GC_DCTL_RSV0_STATES, GC_EVB_DCTL_RSV0_STATES);
+
+        /* DLL reset done? */
+        while ((inreg(dram_ctrl, GC_DCTL_RSV0_STATES) & GC_DCTL_STATES_MSK)) {
+                udelay(GC_DCTL_INIT_WAIT_INTERVAL);
+                if (i++ > GC_DCTL_INIT_WAIT_CNT) {
+                        dev_err(par->dev, "VRAM init failed.\n");
+                        return -EINVAL;
+                }
+        }
+        outreg(dram_ctrl, GC_DCTL_MODE_ADD, GC_EVB_DCTL_MODE_ADD_AFT_RST);
+        outreg(dram_ctrl, GC_DCTL_RSV0_STATES, GC_EVB_DCTL_RSV0_STATES_AFT_RST);
+        return 0;
+}
+
+static int carmine_init(struct mb862xxfb_par *par)
+{
+        unsigned long reg;
+
+        par->ctrl = par->mmio_base + MB86297_CTRL_BASE;
+        par->i2c = par->mmio_base + MB86297_I2C_BASE;
+        par->disp = par->mmio_base + MB86297_DISP0_BASE;
+        par->disp1 = par->mmio_base + MB86297_DISP1_BASE;
+        par->cap = par->mmio_base + MB86297_CAP0_BASE;
+        par->cap1 = par->mmio_base + MB86297_CAP1_BASE;
+        par->draw = par->mmio_base + MB86297_DRAW_BASE;
+        par->dram_ctrl = par->mmio_base + MB86297_DRAMCTRL_BASE;
+        par->wrback = par->mmio_base + MB86297_WRBACK_BASE;
+
+        par->refclk = GC_DISP_REFCLK_533;
+
+        /* warm up */
+        reg = GC_CTRL_CLK_EN_DRAM | GC_CTRL_CLK_EN_2D3D | GC_CTRL_CLK_EN_DISP0;
+        outreg(ctrl, GC_CTRL_CLK_ENABLE, reg);
+
+        /* check for engine module revision */
+        if (inreg(draw, GC_2D3D_REV) == GC_RE_REVISION)
+                dev_info(par->dev, "Fujitsu Carmine GDC Rev.%d found\n",
+                         par->pdev->revision);
+        else
+                goto err_init;
+
+        reg &= ~GC_CTRL_CLK_EN_2D3D;
+        outreg(ctrl, GC_CTRL_CLK_ENABLE, reg);
+
+        /* set up vram */
+        if (init_dram_ctrl(par) < 0)
+                goto err_init;
+
+        outreg(ctrl, GC_CTRL_INT_MASK, 0);
+        return 0;
+
+err_init:
+        outreg(ctrl, GC_CTRL_CLK_ENABLE, 0);
+        return -EINVAL;
+}
+
+static inline int mb862xx_pci_gdc_init(struct mb862xxfb_par *par)
+{
+        switch (par->type) {
+        case BT_CORALP:
+                return coralp_init(par);
+        case BT_CARMINE:
+                return carmine_init(par);
+        default:
+                return -ENODEV;
+        }
+}
+
+#define CHIP_ID(id)     \
+        { PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) }
+
+static struct pci_device_id mb862xx_pci_tbl[] __devinitdata = {
+        /* MB86295/MB86296 */
+        CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP),
+        CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA),
+        /* MB86297 */
+        CHIP_ID(PCI_DEVICE_ID_FUJITSU_CARMINE),
+        { 0, }
+};
+
+MODULE_DEVICE_TABLE(pci, mb862xx_pci_tbl);
+
+static int __devinit mb862xx_pci_probe(struct pci_dev *pdev,
+                                       const struct pci_device_id *ent)
+{
+        struct mb862xxfb_par *par;
+        struct fb_info *info;
+        struct device *dev = &pdev->dev;
+        int ret;
+
+        ret = pci_enable_device(pdev);
+        if (ret < 0) {
+                dev_err(dev, "Cannot enable PCI device\n");
+                goto out;
+        }
+
+        info = framebuffer_alloc(sizeof(struct mb862xxfb_par), dev);
+        if (!info) {
+                dev_err(dev, "framebuffer alloc failed\n");
+                ret = -ENOMEM;
+                goto dis_dev;
+        }
+
+        par = info->par;
+        par->info = info;
+        par->dev = dev;
+        par->pdev = pdev;
+        par->irq = pdev->irq;
+
+        ret = pci_request_regions(pdev, DRV_NAME);
+        if (ret < 0) {
+                dev_err(dev, "Cannot reserve region(s) for PCI device\n");
+                goto rel_fb;
+        }
+
+        switch (pdev->device) {
+        case PCI_DEVICE_ID_FUJITSU_CORALP:
+        case PCI_DEVICE_ID_FUJITSU_CORALPA:
+                par->fb_base_phys = pci_resource_start(par->pdev, 0);
+                par->mapped_vram = CORALP_MEM_SIZE;
+                par->mmio_base_phys = par->fb_base_phys + MB862XX_MMIO_BASE;
+                par->mmio_len = MB862XX_MMIO_SIZE;
+                par->type = BT_CORALP;
+                break;
+        case PCI_DEVICE_ID_FUJITSU_CARMINE:
+                par->fb_base_phys = pci_resource_start(par->pdev, 2);
+                par->mmio_base_phys = pci_resource_start(par->pdev, 3);
+                par->mmio_len = pci_resource_len(par->pdev, 3);
+                par->mapped_vram = CARMINE_MEM_SIZE;
+                par->type = BT_CARMINE;
+                break;
+        default:
+                /* should never occur */
+                goto rel_reg;
+        }
+
+        par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram);
+        if (par->fb_base == NULL) {
+                dev_err(dev, "Cannot map framebuffer\n");
+                goto rel_reg;
+        }
+
+        par->mmio_base = ioremap(par->mmio_base_phys, par->mmio_len);
+        if (par->mmio_base == NULL) {
+                dev_err(dev, "Cannot map registers\n");
+                ret = -EIO;
+                goto fb_unmap;
+        }
+
+        dev_dbg(dev, "fb phys 0x%llx 0x%lx\n",
+                (u64)par->fb_base_phys, (ulong)par->mapped_vram);
+        dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n",
+                (u64)par->mmio_base_phys, (ulong)par->mmio_len);
+
+        if (mb862xx_pci_gdc_init(par))
+                goto io_unmap;
+
+        if (request_irq(par->irq, mb862xx_intr, IRQF_DISABLED | IRQF_SHARED,
+                        DRV_NAME, (void *)par)) {
+                dev_err(dev, "Cannot request irq\n");
+                goto io_unmap;
+        }
+
+        mb862xxfb_init_fbinfo(info);
+
+        if (fb_alloc_cmap(&info->cmap, NR_PALETTE, 0) < 0) {
+                dev_err(dev, "Could not allocate cmap for fb_info.\n");
+                ret = -ENOMEM;
+                goto free_irq;
+        }
+
+        if ((info->fbops->fb_set_par)(info))
+                dev_err(dev, "set_var() failed on initial setup?\n");
+
+        ret = register_framebuffer(info);
+        if (ret < 0) {
+                dev_err(dev, "failed to register framebuffer\n");
+                goto rel_cmap;
+        }
+
+        pci_set_drvdata(pdev, info);
+
+        if (device_create_file(dev, &dev_attr_dispregs))
+                dev_err(dev, "Can't create sysfs regdump file\n");
+
+        if (par->type == BT_CARMINE)
+                outreg(ctrl, GC_CTRL_INT_MASK, GC_CARMINE_INT_EN);
+        else
+                outreg(host, GC_IMASK, GC_INT_EN);
+
+        return 0;
+
+rel_cmap:
+        fb_dealloc_cmap(&info->cmap);
+free_irq:
+        free_irq(par->irq, (void *)par);
+io_unmap:
+        iounmap(par->mmio_base);
+fb_unmap:
+        iounmap(par->fb_base);
+rel_reg:
+        pci_release_regions(pdev);
+rel_fb:
+        framebuffer_release(info);
+dis_dev:
+        pci_disable_device(pdev);
+out:
+        return ret;
+}
+
+static void __devexit mb862xx_pci_remove(struct pci_dev *pdev)
+{
+        struct fb_info *fbi = pci_get_drvdata(pdev);
+        struct mb862xxfb_par *par = fbi->par;
+        unsigned long reg;
+
+        dev_dbg(fbi->dev, "%s release\n", fbi->fix.id);
+
+        /* display off */
+        reg = inreg(disp, GC_DCM1);
+        reg &= ~(GC_DCM01_DEN | GC_DCM01_L0E);
+        outreg(disp, GC_DCM1, reg);
+
+        if (par->type == BT_CARMINE) {
+                outreg(ctrl, GC_CTRL_INT_MASK, 0);
+                outreg(ctrl, GC_CTRL_CLK_ENABLE, 0);
+        } else {
+                outreg(host, GC_IMASK, 0);
+        }
+
+        device_remove_file(&pdev->dev, &dev_attr_dispregs);
+
+        pci_set_drvdata(pdev, NULL);
+        unregister_framebuffer(fbi);
+        fb_dealloc_cmap(&fbi->cmap);
+
+        free_irq(par->irq, (void *)par);
+        iounmap(par->mmio_base);
+        iounmap(par->fb_base);
+
+        pci_release_regions(pdev);
+        framebuffer_release(fbi);
+        pci_disable_device(pdev);
+}
+
+static struct pci_driver mb862xxfb_pci_driver = {
+        .name           = DRV_NAME,
+        .id_table       = mb862xx_pci_tbl,
+        .probe          = mb862xx_pci_probe,
+        .remove         = __devexit_p(mb862xx_pci_remove),
+};
+#endif
+
+static int __devinit mb862xxfb_init(void)
+{
+        int ret = -ENODEV;
+
+#if defined(CONFIG_FB_MB862XX_LIME)
+        ret = of_register_platform_driver(&of_platform_mb862xxfb_driver);
+#endif
+#if defined(CONFIG_FB_MB862XX_PCI_GDC)
+        ret = pci_register_driver(&mb862xxfb_pci_driver);
+#endif
+        return ret;
+}
+
+static void __exit mb862xxfb_exit(void)
+{
+#if defined(CONFIG_FB_MB862XX_LIME)
+        of_unregister_platform_driver(&of_platform_mb862xxfb_driver);
+#endif
+#if defined(CONFIG_FB_MB862XX_PCI_GDC)
+        pci_unregister_driver(&mb862xxfb_pci_driver);
+#endif
+}
+
+module_init(mb862xxfb_init);
+module_exit(mb862xxfb_exit);
+
+MODULE_DESCRIPTION("Fujitsu MB862xx Framebuffer driver");
+MODULE_AUTHOR("Anatolij Gustschin <agust@denx.de>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/mb862xx/mb862xxfb.h b/drivers/video/mb862xx/mb862xxfb.h
new file mode 100644
index 000000000000..c4c8f4dd2217
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb.h
@@ -0,0 +1,83 @@
+#ifndef __MB862XX_H__
+#define __MB862XX_H__
+
+#define PCI_VENDOR_ID_FUJITSU_LIMITED   0x10cf
+#define PCI_DEVICE_ID_FUJITSU_CORALP    0x2019
+#define PCI_DEVICE_ID_FUJITSU_CORALPA   0x201e
+#define PCI_DEVICE_ID_FUJITSU_CARMINE   0x202b
+
+#define GC_MMR_CORALP_EVB_VAL           0x11d7fa13
+
+enum gdctype {
+        BT_NONE,
+        BT_LIME,
+        BT_MINT,
+        BT_CORAL,
+        BT_CORALP,
+        BT_CARMINE,
+};
+
+struct mb862xx_gc_mode {
+        struct fb_videomode     def_mode;       /* mode of connected display */
+        unsigned int            def_bpp;        /* default depth */
+        unsigned long           max_vram;       /* connected SDRAM size */
+        unsigned long           ccf;            /* gdc clk */
+        unsigned long           mmr;            /* memory mode for SDRAM */
+};
+
+/* private data */
+struct mb862xxfb_par {
+        struct fb_info          *info;          /* fb info head */
+        struct device           *dev;
+        struct pci_dev          *pdev;
+        struct resource         *res;           /* framebuffer/mmio resource */
+
+        resource_size_t         fb_base_phys;   /* fb base, 36-bit PPC440EPx */
+        resource_size_t         mmio_base_phys; /* io base addr */
+        void __iomem            *fb_base;       /* remapped framebuffer */
+        void __iomem            *mmio_base;     /* remapped registers */
+        size_t                  mapped_vram;    /* length of remapped vram */
+        size_t                  mmio_len;       /* length of register region */
+
+        void __iomem            *host;          /* relocatable reg. bases */
+        void __iomem            *i2c;
+        void __iomem            *disp;
+        void __iomem            *disp1;
+        void __iomem            *cap;
+        void __iomem            *cap1;
+        void __iomem            *draw;
+        void __iomem            *geo;
+        void __iomem            *pio;
+        void __iomem            *ctrl;
+        void __iomem            *dram_ctrl;
+        void __iomem            *wrback;
+
+        unsigned int            irq;
+        unsigned int            type;           /* GDC type */
+        unsigned int            refclk;         /* disp. reference clock */
+        struct mb862xx_gc_mode  *gc_mode;       /* GDC mode init data */
+        int                     pre_init;       /* don't init display if 1 */
+
+        u32                     pseudo_palette[16];
+};
+
+#if defined(CONFIG_FB_MB862XX_LIME) && defined(CONFIG_FB_MB862XX_PCI_GDC)
+#error  "Select Lime GDC or CoralP/Carmine support, but not both together"
+#endif
+#if defined(CONFIG_FB_MB862XX_LIME)
+#define gdc_read        __raw_readl
+#define gdc_write       __raw_writel
+#else
+#define gdc_read        readl
+#define gdc_write       writel
+#endif
+
+#define inreg(type, off)        \
+        gdc_read((par->type + (off)))
+
+#define outreg(type, off, val)  \
+        gdc_write((val), (par->type + (off)))
+
+#define pack(a, b)      (((a) << 16) | (b))
+
+#endif
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
index 8e5263c5b812..7543d5f7e309 100644
--- a/drivers/video/via/global.h
+++ b/drivers/video/via/global.h
@@ -38,7 +38,6 @@
 #include "iface.h"
 #include "viafbdev.h"
 #include "chip.h"
-#include "debug.h"
 #include "accel.h"
 #include "share.h"
 #include "dvi.h"
@@ -48,12 +47,10 @@
 
 #include "lcd.h"
 #include "ioctl.h"
-#include "viamode.h"
 #include "via_utility.h"
 #include "vt1636.h"
 #include "tblDPASetting.h"
 #include "tbl1636.h"
-#include "viafbdev.h"
 
 /* External struct*/
 
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 1a22fe782a27..4fd3fa5546b1 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG
           system when the timeout is reached.
 
 config AT91SAM9X_WATCHDOG
-        tristate "AT91SAM9X watchdog"
-        depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)
+        tristate "AT91SAM9X / AT91CAP9 watchdog"
+        depends on ARCH_AT91 && !ARCH_AT91RM9200
         help
-          Watchdog timer embedded into AT91SAM9X chips. This will reboot your
-          system when the timeout is reached.
+          Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
+          reboot your system when the timeout is reached.
 
 config 21285_WATCHDOG
         tristate "DC21285 watchdog"
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 6e46a551395c..3e57aa4d643a 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -3,8 +3,8 @@
  *
  *      Based on wdt.c. Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -15,7 +15,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index a5110f93a755..a1d7856ea6e0 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -6,8 +6,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index b4babfc31586..b1da287f90ec 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -30,7 +30,7 @@
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
 
-#include <asm/arch/at91_wdt.h>
+#include <mach/at91_wdt.h>
 
 #define DRV_NAME "AT91SAM9 Watchdog"
 
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 31b42253054e..067a57cb3f82 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -5,7 +5,7 @@
  * Originally based on softdog.c
  * Copyright 2006-2007 Analog Devices Inc.
  * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <alan@redhat.com>
+ * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Enter bugs at http://blackfin.uclinux.org/
  *
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index c3b78a76f173..225398fd5049 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -42,8 +42,10 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
 
 #ifdef  CONFIG_FSL_BOOKE
 #define WDTP(x)         ((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15))
+#define WDTP_MASK       (WDTP(0))
 #else
 #define WDTP(x)         (TCR_WP(x))
+#define WDTP_MASK       (TCR_WP_MASK)
 #endif
 
 static DEFINE_SPINLOCK(booke_wdt_lock);
@@ -65,6 +67,7 @@ static void __booke_wdt_enable(void *data)
         /* clear status before enabling watchdog */
         __booke_wdt_ping(NULL);
         val = mfspr(SPRN_TCR);
+        val &= ~WDTP_MASK;
         val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
 
         mtspr(SPRN_TCR, val);
@@ -114,7 +117,7 @@ static long booke_wdt_ioctl(struct file *file,
         case WDIOC_SETTIMEOUT:
                 if (get_user(booke_wdt_period, p))
                         return -EFAULT;
-                mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP(0)) |
+                mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP_MASK) |
                                                 WDTP(booke_wdt_period));
                 return 0;
         case WDIOC_GETTIMEOUT:
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index bbd14e34319f..a171fc6ae1cb 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -8,8 +8,8 @@
  *      Based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c13383f7fcb9..74f951c18b90 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -394,8 +394,7 @@ static unsigned char __init esb_getdevice(void)
                         goto err_disable;
                 }
 
-                BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
-                                   pci_resource_len(esb_pci, 0));
+                BASEADDR = pci_ioremap_bar(esb_pci, 0);
                 if (BASEADDR == NULL) {
                         /* Something's wrong here, BASEADDR has to be set */
                         printk(KERN_ERR PFX "failed to get BASEADDR\n");
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 8782ec1f5aa0..317ef2b16cff 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -11,8 +11,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 73c9e7992feb..0f761db9a27c 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -9,7 +9,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 2a9bfa81f9d6..1130ad697ce2 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -4,8 +4,8 @@
  *      (c) Copyright 2004 ARM Limited
  *
  *      Based on the SoftDog driver:
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 7bcbb7f4745f..2f2ce7429f5b 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -16,7 +16,7 @@
  * 20030527: George G. Davis <gdavis@mvista.com>
  *      Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
  *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *      Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *      Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * Copyright (c) 2004 Texas Instruments.
  *      1. Modified to support OMAP1610 32-KHz watchdog timer
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 90eb1d4271d7..5d76422c402c 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -6,7 +6,7 @@
  *      Based on source code of the following authors:
  *        Ken Hollis <kenji@bitgate.com>,
  *        Lindsay Harris <lindsay@bluegum.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *        Matt Domsch <Matt_Domsch@dell.com>,
  *        Rob Radez <rob@osinvestor.com>
  *
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index c1685c942de6..afb089695da8 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -5,7 +5,7 @@
  *
  *      Based on source code of the following authors:
  *        Ken Hollis <kenji@bitgate.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *        Matt Domsch <Matt_Domsch@dell.com>,
  *        Rob Radez <rob@osinvestor.com>,
  *        Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index c9c73b69c5e5..57027f4653ce 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -7,7 +7,8 @@
  *  based on
  *  SoftDog 0.05:       A Software Watchdog Device
  *
- *  (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *  (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                      All Rights Reserved.
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 86d42801de45..f7f6ce82a5e2 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -6,7 +6,7 @@
  * S3C2410 Watchdog Timer Support
  *
  * Based on, softdog.c by Alan Cox,
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 31a48437dc3d..ed01e4c2beff 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -2,7 +2,7 @@
  *      Watchdog driver for the SA11x0/PXA2xx
  *
  *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *          Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *          Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 27e526a07c9a..38f5831c9291 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -35,8 +35,8 @@
  * Based on various other watchdog drivers, which are probably all
  * loosely based on something Alan Cox wrote years ago.
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index fd83dd052d8c..ae74f6bcfa23 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -16,8 +16,8 @@
  *      Based on acquirewdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
  *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
  *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index e5e470ca7759..06553debc7bc 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -10,7 +10,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 988ff1d5b4be..2e56cad77d19 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -1,7 +1,7 @@
 /*
  *      SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
  *
- *      Based on acquirewdt.c by Alan Cox <alan@redhat.com>
+ *      Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
  *       and some other existing drivers
  *
  *      This program is free software; you can redistribute it and/or
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index c650464c5c63..7204f9662114 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -1,8 +1,7 @@
 /*
  *      SoftDog 0.07:   A Software Watchdog Device
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 69396adaa5c3..916890abffdd 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -11,8 +11,8 @@
  *
  *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
  *      warranty for any of this software. This material is provided
  *      "AS-IS" and at no charge.
  *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  */
 
 #include <linux/module.h>
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 445d30a01ed3..3c7aa412b1f3 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -12,8 +12,8 @@
  *
  *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 68377ae171ff..42e940c23891 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -10,8 +10,8 @@
  *      Based on advantechwdt.c which is based on wdt.c.
  *      Original copyright messages:
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index deeebb2b13ea..eddb9187e7b6 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -1,8 +1,8 @@
 /*
  *      Industrial Computer Source WDT500/501 driver
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 191ea6302107..f55135662d78 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -6,7 +6,8 @@
  *
  *      SoftDog 0.05:   A Software Watchdog Device
  *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index ed02bdb38c09..c45839a4a34d 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -1,8 +1,8 @@
 /*
  *      Industrial Computer Source PCI-WDT500/501 driver
  *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                              http://www.redhat.com
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                               All Rights Reserved.
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 8c83abc73400..a0fb5eac407c 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -41,7 +41,6 @@
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
 #include <linux/mutex.h>
-#include <linux/highmem.h>
 #include <linux/list.h>
 #include <linux/sysdev.h>
 
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 9ce1ab6c268d..1e3b934a4cf7 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -774,7 +774,7 @@ void xen_poll_irq(int irq)
 
                 poll.nr_ports = 1;
                 poll.timeout = 0;
-                poll.ports = &evtchn;
+                set_xen_guest_handle(poll.ports, &evtchn);
 
                 if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)
                         BUG();
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index d0e87cbe157c..9b91617b9582 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -39,8 +39,6 @@ static int xen_suspend(void *data)
 
         BUG_ON(!irqs_disabled());
 
-        load_cr3(swapper_pg_dir);
-
         err = device_power_down(PMSG_SUSPEND);
         if (err) {
                 printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
diff --git a/drivers/xen/xencomm.c b/drivers/xen/xencomm.c
index 797cb4e31f07..a240b2c20b99 100644
--- a/drivers/xen/xencomm.c
+++ b/drivers/xen/xencomm.c
@@ -23,13 +23,7 @@
 #include <asm/page.h>
 #include <xen/xencomm.h>
 #include <xen/interface/xen.h>
-#ifdef __ia64__
-#include <asm/xen/xencomm.h>    /* for is_kern_addr() */
-#endif
-
-#ifdef HAVE_XEN_PLATFORM_COMPAT_H
-#include <xen/platform-compat.h>
-#endif
+#include <asm/xen/xencomm.h>    /* for xencomm_is_phys_contiguous() */
 
 static int xencomm_init(struct xencomm_desc *desc,
                         void *buffer, unsigned long bytes)
@@ -157,20 +151,11 @@ static int xencomm_create(void *buffer, unsigned long bytes,
         return 0;
 }
 
-/* check if memory address is within VMALLOC region  */
-static int is_phys_contiguous(unsigned long addr)
-{
-        if (!is_kernel_addr(addr))
-                return 0;
-
-        return (addr < VMALLOC_START) || (addr >= VMALLOC_END);
-}
-
 static struct xencomm_handle *xencomm_create_inline(void *ptr)
 {
         unsigned long paddr;
 
-        BUG_ON(!is_phys_contiguous((unsigned long)ptr));
+        BUG_ON(!xencomm_is_phys_contiguous((unsigned long)ptr));
 
         paddr = (unsigned long)xencomm_pa(ptr);
         BUG_ON(paddr & XENCOMM_INLINE_FLAG);
@@ -202,7 +187,7 @@ struct xencomm_handle *xencomm_map(void *ptr, unsigned long bytes)
         int rc;
         struct xencomm_desc *desc;
 
-        if (is_phys_contiguous((unsigned long)ptr))
+        if (xencomm_is_phys_contiguous((unsigned long)ptr))
                 return xencomm_create_inline(ptr);
 
         rc = xencomm_create(ptr, bytes, &desc, GFP_KERNEL);
@@ -219,7 +204,7 @@ struct xencomm_handle *__xencomm_map_no_alloc(void *ptr, unsigned long bytes,
         int rc;
         struct xencomm_desc *desc = NULL;
 
-        if (is_phys_contiguous((unsigned long)ptr))
+        if (xencomm_is_phys_contiguous((unsigned long)ptr))
                 return xencomm_create_inline(ptr);
 
         rc = xencomm_create_mini(ptr, bytes, xc_desc,