Merge branch 'master'

78 files changed, 720 insertions, 514 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 573b6a97bb1f..70d8a6ec0920 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -514,8 +514,6 @@ static int acpi_processor_set_power_policy(struct acpi_processor *pr)
 
 static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
-        int i;
-
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_fadt");
 
         if (!pr)
@@ -524,8 +522,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
         if (!pr->pblk)
                 return_VALUE(-ENODEV);
 
-        for (i = 0; i < ACPI_PROCESSOR_MAX_POWER; i++)
-                memset(pr->power.states, 0, sizeof(struct acpi_processor_cx));
+        memset(pr->power.states, 0, sizeof(pr->power.states));
 
         /* if info is obtained from pblk/fadt, type equals state */
         pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
@@ -555,13 +552,9 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 
 static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)
 {
-        int i;
-
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_default_c1");
 
-        for (i = 0; i < ACPI_PROCESSOR_MAX_POWER; i++)
-                memset(&(pr->power.states[i]), 0,
-                       sizeof(struct acpi_processor_cx));
+        memset(pr->power.states, 0, sizeof(pr->power.states));
 
         /* if info is obtained from pblk/fadt, type equals state */
         pr->power.states[ACPI_STATE_C1].type = ACPI_STATE_C1;
@@ -873,7 +866,8 @@ static int acpi_processor_get_power_info(struct acpi_processor *pr)
         for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 if (pr->power.states[i].valid) {
                         pr->power.count = i;
-                        pr->flags.power = 1;
+                        if (pr->power.states[i].type >= ACPI_STATE_C2)
+                                pr->flags.power = 1;
                 }
         }
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index ea89dca3dbb5..01a1f6badb53 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2203,7 +2203,7 @@ static void setup_xaction_handlers(struct smi_info *smi_info)
 
 static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
 {
-        if (smi_info->thread != ERR_PTR(-ENOMEM))
+        if (smi_info->thread != NULL && smi_info->thread != ERR_PTR(-ENOMEM))
                 kthread_stop(smi_info->thread);
         del_timer_sync(&smi_info->si_timer);
 }
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index b58adfe3ed19..a6873bf89ffa 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -6,7 +6,7 @@ menu "TPM devices"
 
 config TCG_TPM
         tristate "TPM Hardware Support"
-        depends on EXPERIMENTAL && PCI
+        depends on EXPERIMENTAL
         ---help---
           If you have a TPM security chip in your system, which
           implements the Trusted Computing Group's specification,
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 0b283d246730..a9be0e8eaea5 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -377,6 +377,7 @@ int tpm_release(struct inode *inode, struct file *file)
         file->private_data = NULL;
         chip->num_opens--;
         del_singleshot_timer_sync(&chip->user_read_timer);
+        flush_scheduled_work();
         atomic_set(&chip->data_pending, 0);
         put_device(chip->dev);
         kfree(chip->data_buffer);
@@ -428,6 +429,7 @@ ssize_t tpm_read(struct file * file, char __user *buf,
         int ret_size;
 
         del_singleshot_timer_sync(&chip->user_read_timer);
+        flush_scheduled_work();
         ret_size = atomic_read(&chip->data_pending);
         atomic_set(&chip->data_pending, 0);
         if (ret_size > 0) {     /* relay data */
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index deb4b5c80914..ff3654964fe3 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -47,13 +47,12 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
                 return -EIO;
 
         for (i = 0; i < 6; i++) {
-                status = atmel_getb(chip, 1);
+                status = ioread8(chip->vendor->iobase + 1);
                 if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(chip->dev,
-                                "error reading header\n");
+                        dev_err(chip->dev, "error reading header\n");
                         return -EIO;
                 }
-                *buf++ = atmel_getb(chip, 0);
+                *buf++ = ioread8(chip->vendor->iobase);
         }
 
         /* size of the data received */
@@ -64,10 +63,9 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
                 dev_err(chip->dev,
                         "Recv size(%d) less than available space\n", size);
                 for (; i < size; i++) { /* clear the waiting data anyway */
-                        status = atmel_getb(chip, 1);
+                        status = ioread8(chip->vendor->iobase + 1);
                         if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                                dev_err(chip->dev,
-                                        "error reading data\n");
+                                dev_err(chip->dev, "error reading data\n");
                                 return -EIO;
                         }
                 }
@@ -76,17 +74,17 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 
         /* read all the data available */
         for (; i < size; i++) {
-                status = atmel_getb(chip, 1);
+                status = ioread8(chip->vendor->iobase + 1);
                 if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(chip->dev,
-                                "error reading data\n");
+                        dev_err(chip->dev, "error reading data\n");
                         return -EIO;
                 }
-                *buf++ = atmel_getb(chip, 0);
+                *buf++ = ioread8(chip->vendor->iobase);
         }
 
         /* make sure data available is gone */
-        status = atmel_getb(chip, 1);
+        status = ioread8(chip->vendor->iobase + 1);
+
         if (status & ATML_STATUS_DATA_AVAIL) {
                 dev_err(chip->dev, "data available is stuck\n");
                 return -EIO;
@@ -102,7 +100,7 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
         dev_dbg(chip->dev, "tpm_atml_send:\n");
         for (i = 0; i < count; i++) {
                 dev_dbg(chip->dev, "%d 0x%x(%d)\n",  i, buf[i], buf[i]);
-                atmel_putb(buf[i], chip, 0);
+                iowrite8(buf[i], chip->vendor->iobase);
         }
 
         return count;
@@ -110,12 +108,12 @@ static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
 
 static void tpm_atml_cancel(struct tpm_chip *chip)
 {
-        atmel_putb(ATML_STATUS_ABORT, chip, 1);
+        iowrite8(ATML_STATUS_ABORT, chip->vendor->iobase + 1);
 }
 
 static u8 tpm_atml_status(struct tpm_chip *chip)
 {
-        return atmel_getb(chip, 1);
+        return ioread8(chip->vendor->iobase + 1);
 }
 
 static struct file_operations atmel_ops = {
@@ -162,7 +160,8 @@ static void atml_plat_remove(void)
 
         if (chip) {
                 if (chip->vendor->have_region)
-                        atmel_release_region(chip->vendor->base, chip->vendor->region_size);
+                        atmel_release_region(chip->vendor->base,
+                                             chip->vendor->region_size);
                 atmel_put_base_addr(chip->vendor);
                 tpm_remove_hardware(chip->dev);
                 platform_device_unregister(pdev);
@@ -183,14 +182,19 @@ static int __init init_atmel(void)
 
         driver_register(&atml_drv);
 
-        if (atmel_get_base_addr(&tpm_atmel) != 0) {
+        if ((tpm_atmel.iobase = atmel_get_base_addr(&tpm_atmel)) == NULL) {
                 rc = -ENODEV;
                 goto err_unreg_drv;
         }
 
-        tpm_atmel.have_region = (atmel_request_region( tpm_atmel.base, tpm_atmel.region_size, "tpm_atmel0") == NULL) ? 0 : 1;
+        tpm_atmel.have_region =
+            (atmel_request_region
+             (tpm_atmel.base, tpm_atmel.region_size,
+              "tpm_atmel0") == NULL) ? 0 : 1;
 
-        if (IS_ERR(pdev = platform_device_register_simple("tpm_atmel", -1, NULL, 0 ))) {
+        if (IS_ERR
+            (pdev =
+             platform_device_register_simple("tpm_atmel", -1, NULL, 0))) {
                 rc = PTR_ERR(pdev);
                 goto err_rel_reg;
         }
@@ -202,9 +206,10 @@ static int __init init_atmel(void)
 err_unreg_dev:
         platform_device_unregister(pdev);
 err_rel_reg:
-        if (tpm_atmel.have_region)
-                atmel_release_region(tpm_atmel.base, tpm_atmel.region_size);
         atmel_put_base_addr(&tpm_atmel);
+        if (tpm_atmel.have_region)
+                atmel_release_region(tpm_atmel.base,
+                                     tpm_atmel.region_size);
 err_unreg_drv:
         driver_unregister(&atml_drv);
         return rc;
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 3c5b9a8d1c49..d3478aaadd77 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -27,12 +27,14 @@
 #define atmel_putb(val, chip, offset) writeb(val, chip->vendor->iobase + offset)
 #define atmel_request_region request_mem_region
 #define atmel_release_region release_mem_region
-static inline void atmel_put_base_addr(struct tpm_vendor_specific *vendor)
+
+static inline void atmel_put_base_addr(struct tpm_vendor_specific
+                                         *vendor)
 {
         iounmap(vendor->iobase);
 }
 
-static int atmel_get_base_addr(struct tpm_vendor_specific *vendor)
+static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific *vendor)
 {
         struct device_node *dn;
         unsigned long address, size;
@@ -44,11 +46,11 @@ static int atmel_get_base_addr(struct tpm_vendor_specific *vendor)
         dn = of_find_node_by_name(NULL, "tpm");
 
         if (!dn)
-                return 1;
+                return NULL;
 
         if (!device_is_compatible(dn, "AT97SC3201")) {
                 of_node_put(dn);
-                return 1;
+                return NULL;
         }
 
         reg = (unsigned int *) get_property(dn, "reg", &reglen);
@@ -71,8 +73,7 @@ static int atmel_get_base_addr(struct tpm_vendor_specific *vendor)
 
         vendor->base = address;
         vendor->region_size = size;
-        vendor->iobase = ioremap(address, size);
-        return 0;
+        return ioremap(vendor->base, vendor->region_size);
 }
 #else
 #define atmel_getb(chip, offset) inb(chip->vendor->base + offset)
@@ -105,18 +106,19 @@ static int atmel_verify_tpm11(void)
         return 0;
 }
 
-static inline void atmel_put_base_addr(struct tpm_vendor_specific *vendor)
+static inline void atmel_put_base_addr(struct tpm_vendor_specific
+                                         *vendor)
 {
 }
 
 /* Determine where to talk to device */
-static unsigned long atmel_get_base_addr(struct tpm_vendor_specific
+static void __iomem * atmel_get_base_addr(struct tpm_vendor_specific
                                          *vendor)
 {
         int lo, hi;
 
         if (atmel_verify_tpm11() != 0)
-                return 1;
+                return NULL;
 
         lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);
         hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);
@@ -124,6 +126,6 @@ static unsigned long atmel_get_base_addr(struct tpm_vendor_specific
         vendor->base = (hi << 8) | lo;
         vendor->region_size = 2;
 
-        return 0;
+        return ioport_map(vendor->base, vendor->region_size);
 }
 #endif
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index aa36855fa995..f87220be3c87 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -35,7 +35,7 @@
 
 #include <asm/hardware.h>       /* Pick up IXP4xx-specific bits */
 
-static struct device_driver ixp4xx_i2c_driver;
+static struct platform_driver ixp4xx_i2c_driver;
 
 static inline int ixp4xx_scl_pin(void *data)
 {
@@ -128,7 +128,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
         drv_data->algo_data.timeout = 100;
 
         drv_data->adapter.id = I2C_HW_B_IXP4XX;
-        strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name,
+        strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.driver.name,
                 I2C_NAME_SIZE);
         drv_data->adapter.algo_data = &drv_data->algo_data;
 
@@ -140,7 +140,8 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
         gpio_line_set(gpio->sda_pin, 0);
 
         if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) {
-                printk(KERN_ERR "ERROR: Could not install %s\n", dev->bus_id);
+                printk(KERN_ERR "ERROR: Could not install %s\n", 
+                                plat_dev->dev.bus_id);
 
                 kfree(drv_data);
                 return err;
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 42e5b8175cbf..ed2bc87f475b 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -787,6 +787,10 @@ config BLK_DEV_IDE_PMAC_BLINK
           This option enables the use of the sleep LED as a hard drive
           activity LED.
 
+config BLK_DEV_IDE_SWARM
+        tristate "IDE for Sibyte evaluation boards"
+        depends on SIBYTE_SB1xxx_SOC
+
 config BLK_DEV_IDE_AU1XXX
        bool "IDE for AMD Alchemy Au1200"
        depends on SOC_AU1200
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile
index cca9c075966d..569fae717503 100644
--- a/drivers/ide/Makefile
+++ b/drivers/ide/Makefile
@@ -48,6 +48,6 @@ obj-$(CONFIG_BLK_DEV_IDECD)		+= ide-cd.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)           += ide-tape.o
 obj-$(CONFIG_BLK_DEV_IDEFLOPPY)         += ide-floppy.o
 
-obj-$(CONFIG_BLK_DEV_IDE)               += legacy/ arm/
+obj-$(CONFIG_BLK_DEV_IDE)               += legacy/ arm/ mips/
 obj-$(CONFIG_BLK_DEV_HD)                += legacy/
 obj-$(CONFIG_ETRAX_IDE)         += cris/
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile
new file mode 100644
index 000000000000..578e52a59588
--- /dev/null
+++ b/drivers/ide/mips/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_BLK_DEV_IDE_SWARM)         += swarm.o
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
new file mode 100644
index 000000000000..66f6064f4640
--- /dev/null
+++ b/drivers/ide/mips/swarm.c
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2001, 2002, 2003 Broadcom Corporation
+ * Copyright (C) 2004 MontaVista Software Inc.
+ *      Author: Manish Lachwani, mlachwani@mvista.com
+ * Copyright (C) 2004  MIPS Technologies, Inc.  All rights reserved.
+ *      Author: Maciej W. Rozycki <macro@mips.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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*
+ *  Derived loosely from ide-pmac.c, so:
+ *  Copyright (C) 1998 Paul Mackerras.
+ *  Copyright (C) 1995-1998 Mark Lord
+ */
+
+/*
+ * Boards with SiByte processors so far have supported IDE devices via
+ * the Generic Bus, PCI bus, and built-in PCMCIA interface.  In all
+ * cases, byte-swapping must be avoided for these devices (whereas
+ * other PCI devices, for example, will require swapping).  Any
+ * SiByte-targetted kernel including IDE support will include this
+ * file.  Probing of a Generic Bus for an IDE device is controlled by
+ * the definition of "SIBYTE_HAVE_IDE", which is provided by
+ * <asm/sibyte/board.h> for Broadcom boards.
+ */
+
+#include <linux/ide.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+
+#include <asm/sibyte/board.h>
+#include <asm/sibyte/sb1250_genbus.h>
+#include <asm/sibyte/sb1250_regs.h>
+
+#define DRV_NAME "ide-swarm"
+
+static char swarm_ide_string[] = DRV_NAME;
+
+static struct resource swarm_ide_resource = {
+        .name   = "SWARM GenBus IDE",
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device *swarm_ide_dev;
+
+/*
+ * swarm_ide_probe - if the board header indicates the existence of
+ * Generic Bus IDE, allocate a HWIF for it.
+ */
+static int __devinit swarm_ide_probe(struct device *dev)
+{
+        ide_hwif_t *hwif;
+        u8 __iomem *base;
+        phys_t offset, size;
+        int i;
+
+        if (!SIBYTE_HAVE_IDE)
+                return -ENODEV;
+
+        /* Find an empty slot.  */
+        for (i = 0; i < MAX_HWIFS; i++)
+                if (!ide_hwifs[i].io_ports[IDE_DATA_OFFSET])
+                        break;
+        if (i >= MAX_HWIFS) {
+                printk(KERN_ERR DRV_NAME ": no free slot for interface\n");
+                return -ENOMEM;
+        }
+
+        hwif = ide_hwifs + i;
+
+        base = ioremap(A_IO_EXT_BASE, 0x800);
+        offset = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_START_ADDR, IDE_CS));
+        size = __raw_readq(base + R_IO_EXT_REG(R_IO_EXT_MULT_SIZE, IDE_CS));
+        iounmap(base);
+
+        offset = G_IO_START_ADDR(offset) << S_IO_ADDRBASE;
+        size = (G_IO_MULT_SIZE(size) + 1) << S_IO_REGSIZE;
+        if (offset < A_PHYS_GENBUS || offset >= A_PHYS_GENBUS_END) {
+                printk(KERN_INFO DRV_NAME
+                       ": IDE interface at GenBus disabled\n");
+                return -EBUSY;
+        }
+
+        printk(KERN_INFO DRV_NAME ": IDE interface at GenBus slot %i\n",
+               IDE_CS);
+
+        swarm_ide_resource.start = offset;
+        swarm_ide_resource.end = offset + size - 1;
+        if (request_resource(&iomem_resource, &swarm_ide_resource)) {
+                printk(KERN_ERR DRV_NAME
+                       ": can't request I/O memory resource\n");
+                return -EBUSY;
+        }
+
+        base = ioremap(offset, size);
+
+        /* Setup MMIO ops.  */
+        default_hwif_mmiops(hwif);
+        /* Prevent resource map manipulation.  */
+        hwif->mmio = 2;
+        hwif->noprobe = 0;
+
+        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
+                hwif->hw.io_ports[i] =
+                                (unsigned long)(base + ((0x1f0 + i) << 5));
+        hwif->hw.io_ports[IDE_CONTROL_OFFSET] =
+                                (unsigned long)(base + (0x3f6 << 5));
+        hwif->hw.irq = K_INT_GB_IDE;
+
+        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+        hwif->irq = hwif->hw.irq;
+
+        dev_set_drvdata(dev, hwif);
+
+        return 0;
+}
+
+static struct device_driver swarm_ide_driver = {
+        .name   = swarm_ide_string,
+        .bus    = &platform_bus_type,
+        .probe  = swarm_ide_probe,
+};
+
+static void swarm_ide_platform_release(struct device *device)
+{
+        struct platform_device *pldev;
+
+        /* free device */
+        pldev = to_platform_device(device);
+        kfree(pldev);
+}
+
+static int __devinit swarm_ide_init_module(void)
+{
+        struct platform_device *pldev;
+        int err;
+
+        printk(KERN_INFO "SWARM IDE driver\n");
+
+        if (driver_register(&swarm_ide_driver)) {
+                printk(KERN_ERR "Driver registration failed\n");
+                err = -ENODEV;
+                goto out;
+        }
+
+        if (!(pldev = kmalloc(sizeof (*pldev), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto out_unregister_driver;
+        }
+
+        memset (pldev, 0, sizeof (*pldev));
+        pldev->name             = swarm_ide_string;
+        pldev->id               = 0;
+        pldev->dev.release      = swarm_ide_platform_release;
+
+        if (platform_device_register(pldev)) {
+                err = -ENODEV;
+                goto out_free_pldev;
+        }
+
+        if (!pldev->dev.driver) {
+                /*
+                 * The driver was not bound to this device, there was
+                 * no hardware at this address. Unregister it, as the
+                 * release fuction will take care of freeing the
+                 * allocated structure
+                 */
+                platform_device_unregister (pldev);
+        }
+
+        swarm_ide_dev = pldev;
+
+        return 0;
+
+out_free_pldev:
+        kfree(pldev);
+
+out_unregister_driver:
+        driver_unregister(&swarm_ide_driver);
+out:
+        return err;
+}
+
+module_init(swarm_ide_init_module);
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 51315302a85e..252d55df9642 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -326,9 +326,9 @@ static int write_page(struct bitmap *bitmap, struct page *page, int wait)
                 }
         }
 
-        ret = page->mapping->a_ops->prepare_write(NULL, page, 0, PAGE_SIZE);
+        ret = page->mapping->a_ops->prepare_write(bitmap->file, page, 0, PAGE_SIZE);
         if (!ret)
-                ret = page->mapping->a_ops->commit_write(NULL, page, 0,
+                ret = page->mapping->a_ops->commit_write(bitmap->file, page, 0,
                         PAGE_SIZE);
         if (ret) {
                 unlock_page(page);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index f3fed662f32e..78c7418478d6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3846,11 +3846,20 @@ static int is_mddev_idle(mddev_t *mddev)
                 curr_events = disk_stat_read(disk, sectors[0]) + 
                                 disk_stat_read(disk, sectors[1]) - 
                                 atomic_read(&disk->sync_io);
-                /* Allow some slack between valud of curr_events and last_events,
-                 * as there are some uninteresting races.
+                /* The difference between curr_events and last_events
+                 * will be affected by any new non-sync IO (making
+                 * curr_events bigger) and any difference in the amount of
+                 * in-flight syncio (making current_events bigger or smaller)
+                 * The amount in-flight is currently limited to
+                 * 32*64K in raid1/10 and 256*PAGE_SIZE in raid5/6
+                 * which is at most 4096 sectors.
+                 * These numbers are fairly fragile and should be made
+                 * more robust, probably by enforcing the
+                 * 'window size' that md_do_sync sort-of uses.
+                 *
                  * Note: the following is an unsigned comparison.
                  */
-                if ((curr_events - rdev->last_events + 32) > 64) {
+                if ((curr_events - rdev->last_events + 4096) > 8192) {
                         rdev->last_events = curr_events;
                         idle = 0;
                 }
@@ -4109,7 +4118,7 @@ static void md_do_sync(mddev_t *mddev)
                 if (currspeed > sysctl_speed_limit_min) {
                         if ((currspeed > sysctl_speed_limit_max) ||
                                         !is_mddev_idle(mddev)) {
-                                msleep(250);
+                                msleep(500);
                                 goto repeat;
                         }
                 }
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index b0d195d1721a..5e7c7e944c9d 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1110,8 +1110,7 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)
         error->elem_len = elem_len;
         error->log_len = log_len;
         error->elem = (struct ipw_error_elem *)error->payload;
-        error->log = (struct ipw_event *)(error->elem +
-                                          (sizeof(*error->elem) * elem_len));
+        error->log = (struct ipw_event *)(error->elem + elem_len);
 
         ipw_capture_event_log(priv, log_len, error->log);
 
@@ -8926,6 +8925,10 @@ static int ipw_request_direct_scan(struct ipw_priv *priv, char *essid,
         struct ipw_scan_request_ext scan;
         int err = 0, scan_type;
 
+        if (!(priv->status & STATUS_INIT) ||
+            (priv->status & STATUS_EXIT_PENDING))
+                return 0;
+
         down(&priv->sem);
 
         if (priv->status & STATUS_RF_KILL_MASK) {
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index f5b7d360fc10..1026f2bc3185 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1179,12 +1179,12 @@ raw3270_create_attributes(struct raw3270 *rp)
         //FIXME: check return code
         sysfs_create_group(&rp->cdev->dev.kobj, &raw3270_attr_group);
         rp->clttydev =
-                class_device_create(class3270,
+                class_device_create(class3270, NULL,
                                     MKDEV(IBM_TTY3270_MAJOR, rp->minor),
                                     &rp->cdev->dev, "tty%s",
                                     rp->cdev->dev.bus_id);
         rp->cltubdev =
-                class_device_create(class3270,
+                class_device_create(class3270, NULL,
                                     MKDEV(IBM_FS3270_MAJOR, rp->minor),
                                     &rp->cdev->dev, "tub%s",
                                     rp->cdev->dev.bus_id);
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index c52af73a251b..6756d0fab6fe 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -6,7 +6,7 @@
  *
  * DECstation changes
  * Copyright (C) 1998-2000 Harald Koerfgen
- * Copyright (C) 2000, 2001, 2002, 2003, 2004  Maciej W. Rozycki
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  Maciej W. Rozycki
  *
  * For the rest of the code the original Copyright applies:
  * Copyright (C) 1996 Paul Mackerras (Paul.Mackerras@cs.anu.edu.au)
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/spinlock.h>
 #ifdef CONFIG_SERIAL_DEC_CONSOLE
 #include <linux/console.h>
 #endif
@@ -63,7 +64,6 @@
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 #include <asm/bootinfo.h>
 
 #include <asm/dec/interrupts.h>
@@ -128,6 +128,8 @@ static struct zs_parms ds_parms = {
 
 #define BUS_PRESENT (DS_BUS_PRESENT)
 
+DEFINE_SPINLOCK(zs_lock);
+
 struct dec_zschannel zs_channels[NUM_CHANNELS];
 struct dec_serial zs_soft[NUM_CHANNELS];
 int zs_channels_found;
@@ -159,8 +161,6 @@ static unsigned char zs_init_regs[16] __initdata = {
         0                               /* write 15 */
 };
 
-DECLARE_TASK_QUEUE(tq_zs_serial);
-
 static struct tty_driver *serial_driver;
 
 /* serial subtype definitions */
@@ -294,8 +294,7 @@ static inline void zs_rtsdtr(struct dec_serial *info, int which, int set)
 {
         unsigned long flags;
 
-
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
         if (info->zs_channel != info->zs_chan_a) {
                 if (set) {
                         info->zs_chan_a->curregs[5] |= (which & (RTS | DTR));
@@ -304,7 +303,7 @@ static inline void zs_rtsdtr(struct dec_serial *info, int which, int set)
                 }
                 write_zsreg(info->zs_chan_a, 5, info->zs_chan_a->curregs[5]);
         }
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 /* Utility routines for the Zilog */
@@ -345,12 +344,10 @@ static inline void rs_recv_clear(struct dec_zschannel *zsc)
  * This routine is used by the interrupt handler to schedule
  * processing in the software interrupt portion of the driver.
  */
-static _INLINE_ void rs_sched_event(struct dec_serial *info,
-                                  int event)
+static _INLINE_ void rs_sched_event(struct dec_serial *info, int event)
 {
         info->event |= 1 << event;
-        queue_task(&info->tqueue, &tq_zs_serial);
-        mark_bh(SERIAL_BH);
+        tasklet_schedule(&info->tlet);
 }
 
 static _INLINE_ void receive_chars(struct dec_serial *info,
@@ -497,9 +494,10 @@ static _INLINE_ void status_handle(struct dec_serial *info)
 /*
  * This is the serial driver's generic interrupt routine
  */
-void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t rs_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct dec_serial *info = (struct dec_serial *) dev_id;
+        irqreturn_t status = IRQ_NONE;
         unsigned char zs_intreg;
         int shift;
 
@@ -521,6 +519,8 @@ void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
                 if ((zs_intreg & CHAN_IRQMASK) == 0)
                         break;
 
+                status = IRQ_HANDLED;
+
                 if (zs_intreg & CHBRxIP) {
                         receive_chars(info, regs);
                 }
@@ -534,6 +534,8 @@ void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 
         /* Why do we need this ? */
         write_zsreg(info->zs_channel, 0, RES_H_IUS);
+
+        return status;
 }
 
 #ifdef ZS_DEBUG_REGS
@@ -578,12 +580,12 @@ static void rs_stop(struct tty_struct *tty)
                 return;
 
 #if 1
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
         if (info->zs_channel->curregs[5] & TxENAB) {
                 info->zs_channel->curregs[5] &= ~TxENAB;
                 write_zsreg(info->zs_channel, 5, info->zs_channel->curregs[5]);
         }
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 #endif
 }
 
@@ -595,7 +597,7 @@ static void rs_start(struct tty_struct *tty)
         if (serial_paranoia_check(info, tty->name, "rs_start"))
                 return;
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
 #if 1
         if (info->xmit_cnt && info->xmit_buf && !(info->zs_channel->curregs[5] & TxENAB)) {
                 info->zs_channel->curregs[5] |= TxENAB;
@@ -606,7 +608,7 @@ static void rs_start(struct tty_struct *tty)
                 transmit_chars(info);
         }
 #endif
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 /*
@@ -618,12 +620,8 @@ static void rs_start(struct tty_struct *tty)
  * interrupt driver proper are done; the interrupt driver schedules
  * them using rs_sched_event(), and they get done here.
  */
-static void do_serial_bh(void)
-{
-        run_task_queue(&tq_zs_serial);
-}
 
-static void do_softint(void *private_)
+static void do_softint(unsigned long private_)
 {
         struct dec_serial       *info = (struct dec_serial *) private_;
         struct tty_struct       *tty;
@@ -634,10 +632,11 @@ static void do_softint(void *private_)
 
         if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
                 tty_wakeup(tty);
+                wake_up_interruptible(&tty->write_wait);
         }
 }
 
-int zs_startup(struct dec_serial * info)
+static int zs_startup(struct dec_serial * info)
 {
         unsigned long flags;
 
@@ -650,7 +649,7 @@ int zs_startup(struct dec_serial * info)
                         return -ENOMEM;
         }
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
 
 #ifdef SERIAL_DEBUG_OPEN
         printk("starting up ttyS%d (irq %d)...", info->line, info->irq);
@@ -706,7 +705,7 @@ int zs_startup(struct dec_serial * info)
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         info->flags |= ZILOG_INITIALIZED;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
         return 0;
 }
 
@@ -726,7 +725,7 @@ static void shutdown(struct dec_serial * info)
                info->irq);
 #endif
 
-        save_flags(flags); cli(); /* Disable interrupts */
+        spin_lock_irqsave(&zs_lock, flags);
 
         if (info->xmit_buf) {
                 free_page((unsigned long) info->xmit_buf);
@@ -749,7 +748,7 @@ static void shutdown(struct dec_serial * info)
                 set_bit(TTY_IO_ERROR, &info->tty->flags);
 
         info->flags &= ~ZILOG_INITIALIZED;
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 /*
@@ -785,7 +784,7 @@ static void change_speed(struct dec_serial *info)
                         i += 15;
         }
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
         info->zs_baud = baud_table[i];
         if (info->zs_baud) {
                 brg = BPS_TO_BRG(info->zs_baud, zs_parms->clock/info->clk_divisor);
@@ -858,7 +857,7 @@ static void change_speed(struct dec_serial *info)
         /* Load up the new values */
         load_zsregs(info->zs_channel, info->zs_channel->curregs);
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 static void rs_flush_chars(struct tty_struct *tty)
@@ -874,9 +873,9 @@ static void rs_flush_chars(struct tty_struct *tty)
                 return;
 
         /* Enable transmitter */
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
         transmit_chars(info);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 static int rs_write(struct tty_struct * tty,
@@ -892,26 +891,17 @@ static int rs_write(struct tty_struct * tty,
         if (!tty || !info->xmit_buf)
                 return 0;
 
-        save_flags(flags);
         while (1) {
-                cli();
+                spin_lock_irqsave(&zs_lock, flags);
                 c = min(count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
                                    SERIAL_XMIT_SIZE - info->xmit_head));
                 if (c <= 0)
                         break;
 
-                if (from_user) {
-                        down(&tmp_buf_sem);
-                        copy_from_user(tmp_buf, buf, c);
-                        c = min(c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
-                                       SERIAL_XMIT_SIZE - info->xmit_head));
-                        memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
-                        up(&tmp_buf_sem);
-                } else
-                        memcpy(info->xmit_buf + info->xmit_head, buf, c);
+                memcpy(info->xmit_buf + info->xmit_head, buf, c);
                 info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
                 info->xmit_cnt += c;
-                restore_flags(flags);
+                spin_unlock_irqrestore(&zs_lock, flags);
                 buf += c;
                 count -= c;
                 total += c;
@@ -920,7 +910,7 @@ static int rs_write(struct tty_struct * tty,
         if (info->xmit_cnt && !tty->stopped && !info->tx_stopped
             && !info->tx_active)
                 transmit_chars(info);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
         return total;
 }
 
@@ -952,9 +942,9 @@ static void rs_flush_buffer(struct tty_struct *tty)
 
         if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
                 return;
-        cli();
+        spin_lock_irq(&zs_lock);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        sti();
+        spin_unlock_irq(&zs_lock);
         tty_wakeup(tty);
 }
 
@@ -982,11 +972,11 @@ static void rs_throttle(struct tty_struct * tty)
                 return;
 
         if (I_IXOFF(tty)) {
-                save_flags(flags); cli();
+                spin_lock_irqsave(&zs_lock, flags);
                 info->x_char = STOP_CHAR(tty);
                 if (!info->tx_active)
                         transmit_chars(info);
-                restore_flags(flags);
+                spin_unlock_irqrestore(&zs_lock, flags);
         }
 
         if (C_CRTSCTS(tty)) {
@@ -1010,7 +1000,7 @@ static void rs_unthrottle(struct tty_struct * tty)
                 return;
 
         if (I_IXOFF(tty)) {
-                save_flags(flags); cli();
+                spin_lock_irqsave(&zs_lock, flags);
                 if (info->x_char)
                         info->x_char = 0;
                 else {
@@ -1018,7 +1008,7 @@ static void rs_unthrottle(struct tty_struct * tty)
                         if (!info->tx_active)
                                 transmit_chars(info);
                 }
-                restore_flags(flags);
+                spin_unlock_irqrestore(&zs_lock, flags);
         }
 
         if (C_CRTSCTS(tty)) {
@@ -1111,9 +1101,9 @@ static int get_lsr_info(struct dec_serial * info, unsigned int *value)
 {
         unsigned char status;
 
-        cli();
+        spin_lock(&zs_lock);
         status = read_zsreg(info->zs_channel, 0);
-        sti();
+        spin_unlock_irq(&zs_lock);
         put_user(status,value);
         return 0;
 }
@@ -1136,11 +1126,11 @@ static int rs_tiocmget(struct tty_struct *tty, struct file *file)
         if (info->zs_channel == info->zs_chan_a)
                 result = 0;
         else {
-                cli();
+                spin_lock(&zs_lock);
                 control = info->zs_chan_a->curregs[5];
                 status_a = read_zsreg(info->zs_chan_a, 0);
                 status_b = read_zsreg(info->zs_channel, 0);
-                sti();
+                spin_unlock_irq(&zs_lock);
                 result =  ((control  & RTS) ? TIOCM_RTS: 0)
                         | ((control  & DTR) ? TIOCM_DTR: 0)
                         | ((status_b & DCD) ? TIOCM_CAR: 0)
@@ -1155,8 +1145,6 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file,
                        unsigned int set, unsigned int clear)
 {
         struct dec_serial * info = (struct dec_serial *)tty->driver_data;
-        int error;
-        unsigned int arg, bits;
 
         if (info->hook)
                 return -ENODEV;
@@ -1170,8 +1158,7 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file,
         if (info->zs_channel == info->zs_chan_a)
                 return 0;
 
-        get_user(arg, value);
-        cli();
+        spin_lock(&zs_lock);
         if (set & TIOCM_RTS)
                 info->zs_chan_a->curregs[5] |= RTS;
         if (set & TIOCM_DTR)
@@ -1181,7 +1168,7 @@ static int rs_tiocmset(struct tty_struct *tty, struct file *file,
         if (clear & TIOCM_DTR)
                 info->zs_chan_a->curregs[5] &= ~DTR;
         write_zsreg(info->zs_chan_a, 5, info->zs_chan_a->curregs[5]);
-        sti();
+        spin_unlock_irq(&zs_lock);
         return 0;
 }
 
@@ -1198,19 +1185,18 @@ static void rs_break(struct tty_struct *tty, int break_state)
         if (!info->port)
                 return;
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
         if (break_state == -1)
                 info->zs_channel->curregs[5] |= SND_BRK;
         else
                 info->zs_channel->curregs[5] &= ~SND_BRK;
         write_zsreg(info->zs_channel, 5, info->zs_channel->curregs[5]);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 static int rs_ioctl(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg)
 {
-        int error;
         struct dec_serial * info = (struct dec_serial *)tty->driver_data;
 
         if (info->hook)
@@ -1287,10 +1273,10 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
                 return;
 
-        save_flags(flags); cli();
+        spin_lock_irqsave(&zs_lock, flags);
 
         if (tty_hung_up_p(filp)) {
-                restore_flags(flags);
+                spin_unlock_irqrestore(&zs_lock, flags);
                 return;
         }
 
@@ -1315,7 +1301,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                 info->count = 0;
         }
         if (info->count) {
-                restore_flags(flags);
+                spin_unlock_irqrestore(&zs_lock, flags);
                 return;
         }
         info->flags |= ZILOG_CLOSING;
@@ -1358,7 +1344,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         }
         info->flags &= ~(ZILOG_NORMAL_ACTIVE|ZILOG_CLOSING);
         wake_up_interruptible(&info->close_wait);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 /*
@@ -1398,7 +1384,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 /*
  * rs_hangup() --- called by tty_hangup() when a hangup is signaled.
  */
-void rs_hangup(struct tty_struct *tty)
+static void rs_hangup(struct tty_struct *tty)
 {
         struct dec_serial * info = (struct dec_serial *)tty->driver_data;
 
@@ -1466,16 +1452,16 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         printk("block_til_ready before block: ttyS%d, count = %d\n",
                info->line, info->count);
 #endif
-        cli();
+        spin_lock(&zs_lock);
         if (!tty_hung_up_p(filp))
                 info->count--;
-        sti();
+        spin_unlock_irq(&zs_lock);
         info->blocked_open++;
         while (1) {
-                cli();
+                spin_lock(&zs_lock);
                 if (tty->termios->c_cflag & CBAUD)
                         zs_rtsdtr(info, RTS | DTR, 1);
-                sti();
+                spin_unlock_irq(&zs_lock);
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
                     !(info->flags & ZILOG_INITIALIZED)) {
@@ -1523,7 +1509,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
  * the IRQ chain.   It also performs the serial-specific
  * initialization for the tty structure.
  */
-int rs_open(struct tty_struct *tty, struct file * filp)
+static int rs_open(struct tty_struct *tty, struct file * filp)
 {
         struct dec_serial       *info;
         int                     retval, line;
@@ -1706,7 +1692,7 @@ static void __init probe_sccs(void)
                 }
         }
 
-        save_and_cli(flags);
+        spin_lock_irqsave(&zs_lock, flags);
         for (n = 0; n < zs_channels_found; n++) {
                 if (n % 2 == 0) {
                         write_zsreg(zs_soft[n].zs_chan_a, R9, FHWRES);
@@ -1716,7 +1702,7 @@ static void __init probe_sccs(void)
                 load_zsregs(zs_soft[n].zs_channel,
                             zs_soft[n].zs_channel->curregs);
         }
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 }
 
 static struct tty_operations serial_ops = {
@@ -1749,9 +1735,6 @@ int __init zs_init(void)
         if(!BUS_PRESENT)
                 return -ENODEV;
 
-        /* Setup base handler, and timer table. */
-        init_bh(SERIAL_BH, do_serial_bh);
-
         /* Find out how many Z8530 SCCs we have */
         if (zs_chain == 0)
                 probe_sccs();
@@ -1800,8 +1783,7 @@ int __init zs_init(void)
                 info->event = 0;
                 info->count = 0;
                 info->blocked_open = 0;
-                info->tqueue.routine = do_softint;
-                info->tqueue.data = info;
+                tasklet_init(&info->tlet, do_softint, (unsigned long)info);
                 init_waitqueue_head(&info->open_wait);
                 init_waitqueue_head(&info->close_wait);
                 printk("ttyS%02d at 0x%08x (irq = %d) is a Z85C30 SCC\n",
@@ -1833,8 +1815,7 @@ int __init zs_init(void)
 /*
  * polling I/O routines
  */
-static int
-zs_poll_tx_char(void *handle, unsigned char ch)
+static int zs_poll_tx_char(void *handle, unsigned char ch)
 {
         struct dec_serial *info = handle;
         struct dec_zschannel *chan = info->zs_channel;
@@ -1857,8 +1838,7 @@ zs_poll_tx_char(void *handle, unsigned char ch)
                 return -ENODEV;
 }
 
-static int
-zs_poll_rx_char(void *handle)
+static int zs_poll_rx_char(void *handle)
 {
         struct dec_serial *info = handle;
         struct dec_zschannel *chan = info->zs_channel;
@@ -2037,7 +2017,7 @@ static int __init serial_console_setup(struct console *co, char *options)
         }
         co->cflag = cflag;
 
-        save_and_cli(flags);
+        spin_lock_irqsave(&zs_lock, flags);
 
         /*
          * Set up the baud rate generator.
@@ -2092,7 +2072,7 @@ static int __init serial_console_setup(struct console *co, char *options)
         zs_soft[co->index].clk_divisor = clk_divisor;
         zs_soft[co->index].zs_baud = get_zsbaud(&zs_soft[co->index]);
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&zs_lock, flags);
 
         return 0;
 }
@@ -2229,5 +2209,3 @@ void __init zs_kgdb_hook(int tty_num)
         set_debug_traps(); /* init stub */
 }
 #endif /* ifdef CONFIG_KGDB */
-
-
diff --git a/drivers/tc/zs.h b/drivers/tc/zs.h
index c52edffa6049..13512200ceba 100644
--- a/drivers/tc/zs.h
+++ b/drivers/tc/zs.h
@@ -6,14 +6,14 @@
  *
  * Copyright (C) 1996 Paul Mackerras (Paul.Mackerras@cs.anu.edu.au)
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 2004  Maciej W. Rozycki
+ * Copyright (C) 2004, 2005  Maciej W. Rozycki
  */
 #ifndef _DECSERIAL_H
 #define _DECSERIAL_H
 
 #include <asm/dec/serial.h>
 
-#define NUM_ZSREGS    16
+#define NUM_ZSREGS 16
 
 struct serial_struct {
         int     type;
@@ -139,8 +139,7 @@ struct dec_serial {
         int                     xmit_head;
         int                     xmit_tail;
         int                     xmit_cnt;
-        struct tq_struct        tqueue;
-        struct tq_struct        tqueue_hangup;
+        struct tasklet_struct   tlet;
         wait_queue_head_t       open_wait;
         wait_queue_head_t       close_wait;
 };
@@ -282,7 +281,7 @@ struct dec_serial {
 #define DLC     4       /* Disable Lower Chain */
 #define MIE     8       /* Master Interrupt Enable */
 #define STATHI  0x10    /* Status high */
-#define SOFTACK 0x20    /* Software Interrupt Acknowledge */
+#define SOFTACK 0x20    /* Software Interrupt Acknowledge */
 #define NORESET 0       /* No reset on write to R9 */
 #define CHRB    0x40    /* Reset channel B */
 #define CHRA    0x80    /* Reset channel A */
@@ -395,8 +394,8 @@ struct dec_serial {
 /* Read Register 15 (value of WR 15) */
 
 /* Misc macros */
-#define ZS_CLEARERR(channel)    (write_zsreg(channel, 0, ERR_RES))
-#define ZS_CLEARFIFO(channel)   do { volatile unsigned char garbage; \
+#define ZS_CLEARERR(channel)    (write_zsreg(channel, 0, ERR_RES))
+#define ZS_CLEARFIFO(channel)   do { volatile unsigned char garbage; \
                                      garbage = read_zsdata(channel); \
                                      garbage = read_zsdata(channel); \
                                      garbage = read_zsdata(channel); \
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile
index 751f297be2ef..85099718c683 100644
--- a/drivers/usb/atm/Makefile
+++ b/drivers/usb/atm/Makefile
@@ -6,3 +6,7 @@ obj-$(CONFIG_USB_CXACRU)	+= cxacru.o
 obj-$(CONFIG_USB_SPEEDTOUCH)    += speedtch.o
 obj-$(CONFIG_USB_ATM)           += usbatm.o
 obj-$(CONFIG_USB_XUSBATM)       += xusbatm.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index 936646457935..1adacd60d713 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -27,14 +27,9 @@
 #include <linux/config.h>
 
 /*
-#define DEBUG
 #define VERBOSE_DEBUG
 */
 
-#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG)
-#       define DEBUG
-#endif
-
 #include <asm/semaphore.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index dd1c4d2a0c31..86d5c380892d 100644
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -14,3 +14,7 @@ ifeq ($(CONFIG_USB_DEVICEFS),y)
 endif
 
 obj-$(CONFIG_USB)       += usbcore.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/usb/core/buffer.c b/drivers/usb/core/buffer.c
index 57e800ac3cee..419c9943a7cb 100644
--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@@ -15,14 +15,6 @@
 #include <asm/scatterlist.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
-
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/usb.h>
 #include "hcd.h"
 
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 993019500cc3..a9d89c78cc20 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -1,9 +1,4 @@
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-#define DEBUG
-#endif
-
 #include <linux/usb.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 942cd437dc48..b1d6e9af732d 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1392,13 +1392,13 @@ static int proc_ioctl_default(struct dev_state *ps, void __user *arg)
 }
 
 #ifdef CONFIG_COMPAT
-static int proc_ioctl_compat(struct dev_state *ps, void __user *arg)
+static int proc_ioctl_compat(struct dev_state *ps, compat_uptr_t arg)
 {
         struct usbdevfs_ioctl32 __user *uioc;
         struct usbdevfs_ioctl ctrl;
         u32 udata;
 
-        uioc = compat_ptr(arg);
+        uioc = compat_ptr((long)arg);
         if (get_user(ctrl.ifno, &uioc->ifno) ||
             get_user(ctrl.ioctl_code, &uioc->ioctl_code) ||
             __get_user(udata, &uioc->data))
@@ -1511,7 +1511,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
         case USBDEVFS_IOCTL32:
                 snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
-                ret = proc_ioctl_compat(ps, p);
+                ret = proc_ioctl_compat(ps, (compat_uptr_t)(long)p);
                 break;
 #endif
 
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index e695308095ae..37b13368c814 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -19,12 +19,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
 #include <linux/usb.h>
 
 #include "usb.h"
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index 84d9e69329bb..7feb829362d6 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -17,13 +17,6 @@
  */
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 6c7ca5b08cd6..5e5f65a475ab 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -23,11 +23,6 @@
  */
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-#define DEBUG
-#endif
-
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 256d9f698715..840727948d84 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -9,11 +9,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 12f490fdee8f..c44bbedec817 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -46,7 +46,6 @@
 
 static struct super_operations usbfs_ops;
 static struct file_operations default_file_operations;
-static struct inode_operations usbfs_dir_inode_operations;
 static struct vfsmount *usbfs_mount;
 static int usbfs_mount_count;   /* = 0 */
 static int ignore_mount = 0;
@@ -262,7 +261,7 @@ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t de
                         inode->i_fop = &default_file_operations;
                         break;
                 case S_IFDIR:
-                        inode->i_op = &usbfs_dir_inode_operations;
+                        inode->i_op = &simple_dir_inode_operations;
                         inode->i_fop = &simple_dir_operations;
 
                         /* directory inodes start off with i_nlink == 2 (for "." entry) */
@@ -417,10 +416,6 @@ static struct file_operations default_file_operations = {
         .llseek =       default_file_lseek,
 };
 
-static struct inode_operations usbfs_dir_inode_operations = {
-        .lookup =       simple_lookup,
-};
-
 static struct super_operations usbfs_ops = {
         .statfs =       simple_statfs,
         .drop_inode =   generic_delete_inode,
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 644a3d4f12aa..fe74f99ca5f4 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -3,13 +3,6 @@
  */
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/pci.h>  /* for scatterlist macros */
 #include <linux/usb.h>
 #include <linux/module.h>
@@ -1457,12 +1450,11 @@ free_interfaces:
                  */
                 for (i = 0; i < nintf; ++i) {
                         struct usb_interface *intf = cp->interface[i];
-                        struct usb_host_interface *alt = intf->cur_altsetting;
 
                         dev_dbg (&dev->dev,
                                 "adding %s (config #%d, interface %d)\n",
                                 intf->dev.bus_id, configuration,
-                                alt->desc.bInterfaceNumber);
+                                intf->cur_altsetting->desc.bInterfaceNumber);
                         ret = device_add (&intf->dev);
                         if (ret != 0) {
                                 dev_err(&dev->dev,
diff --git a/drivers/usb/core/notify.c b/drivers/usb/core/notify.c
index 37da059eced7..fbbebab52fbd 100644
--- a/drivers/usb/core/notify.c
+++ b/drivers/usb/core/notify.c
@@ -12,13 +12,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/notifier.h>
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
 #include <linux/usb.h>
-
 #include "usb.h"
 
 
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
index edd83e014452..71d881327e88 100644
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
@@ -12,14 +12,7 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
 #include <linux/usb.h>
-
 #include "usb.h"
 
 /* endpoint stuff */
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index f2a1fed2a802..081796726b95 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -4,12 +4,6 @@
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
 #include <linux/usb.h>
 #include "hcd.h"
 
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 0eefff7bcb3c..e197ce9353de 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -22,13 +22,6 @@
  */
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/bitops.h>
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 1e407745c115..c655d46c8aed 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -944,7 +944,7 @@ static int dummy_udc_suspend (struct platform_device *dev, pm_message_t state)
         set_link_state (dum);
         spin_unlock_irq (&dum->lock);
 
-        dev->power.power_state = state;
+        dev->dev.power.power_state = state;
         usb_hcd_poll_rh_status (dummy_to_hcd (dum));
         return 0;
 }
@@ -1904,7 +1904,7 @@ static int dummy_hcd_probe (struct platform_device *dev)
         struct usb_hcd          *hcd;
         int                     retval;
 
-        dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
+        dev_info(&dev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
 
         hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id);
         if (!hcd)
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 081ec3f5cff4..3959ccc88332 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -219,7 +219,7 @@ static int ohci_hcd_lh7a404_drv_probe(struct platform_device *pdev)
 
 static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev)
 {
-        struct usb_hcd *hcd = platform_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_lh7a404_remove(hcd, pdev);
         return 0;
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 18755766e406..2ec6a78bd65e 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -185,7 +185,7 @@ static int ohci_hcd_ppc_soc_drv_probe(struct platform_device *pdev)
 
 static int ohci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
 {
-        struct usb_hcd *hcd = platform_get_drvdata(dev);
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
 
         usb_hcd_ppc_soc_remove(hcd, pdev);
         return 0;
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 61a2604cce4f..950543aa5ac7 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -327,6 +327,18 @@ static inline void mts_urb_abort(struct mts_desc* desc) {
         usb_kill_urb( desc->urb );
 }
 
+static int mts_slave_alloc (struct scsi_device *s)
+{
+        s->inquiry_len = 0x24;
+        return 0;
+}
+
+static int mts_slave_configure (struct scsi_device *s)
+{
+        blk_queue_dma_alignment(s->request_queue, (512 - 1));
+        return 0;
+}
+
 static int mts_scsi_abort (Scsi_Cmnd *srb)
 {
         struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
@@ -411,7 +423,7 @@ static void mts_transfer_done( struct urb *transfer, struct pt_regs *regs )
         MTS_INT_INIT();
 
         context->srb->result &= MTS_SCSI_ERR_MASK;
-        context->srb->result |= (unsigned)context->status<<1;
+        context->srb->result |= (unsigned)(*context->scsi_status)<<1;
 
         mts_transfer_cleanup(transfer);
 
@@ -427,7 +439,7 @@ static void mts_get_status( struct urb *transfer )
         mts_int_submit_urb(transfer,
                            usb_rcvbulkpipe(context->instance->usb_dev,
                                            context->instance->ep_response),
-                           &context->status,
+                           context->scsi_status,
                            1,
                            mts_transfer_done );
 }
@@ -481,7 +493,7 @@ static void mts_command_done( struct urb *transfer, struct pt_regs *regs )
                                            context->data_pipe,
                                            context->data,
                                            context->data_length,
-                                           context->srb->use_sg ? mts_do_sg : mts_data_done);
+                                           context->srb->use_sg > 1 ? mts_do_sg : mts_data_done);
                 } else {
                         mts_get_status(transfer);
                 }
@@ -627,7 +639,6 @@ int mts_scsi_queuecommand( Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback )
                         callback(srb);
 
         }
-
 out:
         return err;
 }
@@ -645,6 +656,9 @@ static struct scsi_host_template mts_scsi_host_template = {
         .cmd_per_lun =          1,
         .use_clustering =       1,
         .emulated =             1,
+        .slave_alloc =          mts_slave_alloc,
+        .slave_configure =      mts_slave_configure,
+        .max_sectors=           256, /* 128 K */
 };
 
 struct vendor_product
@@ -771,8 +785,8 @@ static int mts_usb_probe(struct usb_interface *intf,
                 MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" );
                 return -ENODEV;
         }
-        
-        
+
+
         new_desc = kzalloc(sizeof(struct mts_desc), GFP_KERNEL);
         if (!new_desc)
                 goto out;
@@ -781,6 +795,10 @@ static int mts_usb_probe(struct usb_interface *intf,
         if (!new_desc->urb)
                 goto out_kfree;
 
+        new_desc->context.scsi_status = kmalloc(1, GFP_KERNEL);
+        if (!new_desc->context.scsi_status)
+                goto out_kfree2;
+
         new_desc->usb_dev = dev;
         new_desc->usb_intf = intf;
         init_MUTEX(&new_desc->lock);
@@ -817,6 +835,8 @@ static int mts_usb_probe(struct usb_interface *intf,
         usb_set_intfdata(intf, new_desc);
         return 0;
 
+ out_kfree2:
+        kfree(new_desc->context.scsi_status);
  out_free_urb:
         usb_free_urb(new_desc->urb);
  out_kfree:
@@ -836,6 +856,7 @@ static void mts_usb_disconnect (struct usb_interface *intf)
 
         scsi_host_put(desc->host);
         usb_free_urb(desc->urb);
+        kfree(desc->context.scsi_status);
         kfree(desc);
 }
 
@@ -856,5 +877,3 @@ module_exit(microtek_drv_exit);
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_LICENSE("GPL");
-
-
diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h
index 3271deb8c001..926d4bdc6746 100644
--- a/drivers/usb/image/microtek.h
+++ b/drivers/usb/image/microtek.h
@@ -22,7 +22,7 @@ struct mts_transfer_context
         int data_pipe;
         int fragment;
 
-        u8 status; /* status returned from ep_response after command completion */
+        u8 *scsi_status; /* status returned from ep_response after command completion */
 };
 
 
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 5e03b93f29f6..07cb17db42fc 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -42,3 +42,7 @@ obj-$(CONFIG_USB_ACECAD)	+= acecad.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 79ddce4555ab..45f3130fadea 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1318,6 +1318,7 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_DEVICE_ID_WACOM_PTU         0x0003
 #define USB_DEVICE_ID_WACOM_INTUOS3     0x00B0
 #define USB_DEVICE_ID_WACOM_CINTIQ      0x003F
+#define USB_DEVICE_ID_WACOM_DTF         0x00C0
 
 #define USB_VENDOR_ID_ACECAD            0x0460
 #define USB_DEVICE_ID_ACECAD_FLAIR      0x0004
@@ -1524,6 +1525,9 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 3, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 4, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 5, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 7, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 8, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PL + 9, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 1, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 2, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 3, HID_QUIRK_IGNORE },
@@ -1531,11 +1535,19 @@ static struct hid_blacklist {
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 5, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 7, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 1, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 2, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 3, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_VOLITO + 4, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 5, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 6, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_PTU, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 1, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 2, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS3 + 5, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_CINTIQ, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_DTF, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE },
 
diff --git a/drivers/usb/input/itmtouch.c b/drivers/usb/input/itmtouch.c
index 3b581853cf10..4a50acb39d29 100644
--- a/drivers/usb/input/itmtouch.c
+++ b/drivers/usb/input/itmtouch.c
@@ -40,13 +40,6 @@
  *****************************************************************************/
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/input.h>
diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/usb/input/keyspan_remote.c
index 5b8d65f62abf..a32cfe51b77d 100644
--- a/drivers/usb/input/keyspan_remote.c
+++ b/drivers/usb/input/keyspan_remote.c
@@ -160,7 +160,8 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
          * though so it's not too big a deal
          */
         if (dev->data.pos >= dev->data.len) {
-                dev_dbg(&dev->udev, "%s - Error ran out of data. pos: %d, len: %d\n",
+                dev_dbg(&dev->udev->dev,
+                        "%s - Error ran out of data. pos: %d, len: %d\n",
                         __FUNCTION__, dev->data.pos, dev->data.len);
                 return -1;
         }
@@ -306,7 +307,7 @@ static void keyspan_check_data(struct usb_keyspan *remote, struct pt_regs *regs)
                         err("Bad message recieved, no stop bit found.\n");
                 }
 
-                dev_dbg(&remote->udev,
+                dev_dbg(&remote->udev->dev,
                         "%s found valid message: system: %d, button: %d, toggle: %d\n",
                         __FUNCTION__, message.system, message.button, message.toggle);
 
diff --git a/drivers/usb/input/mtouchusb.c b/drivers/usb/input/mtouchusb.c
index 7fce526560ca..52cc18cd247d 100644
--- a/drivers/usb/input/mtouchusb.c
+++ b/drivers/usb/input/mtouchusb.c
@@ -40,13 +40,6 @@
  *****************************************************************************/
 
 #include <linux/config.h>
-
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG
-#else
-        #undef DEBUG
-#endif
-
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/input.h>
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
index dca5ee93a4ef..19e015d171aa 100644
--- a/drivers/usb/input/pid.c
+++ b/drivers/usb/input/pid.c
@@ -37,8 +37,6 @@
 #include "hid.h"
 #include "pid.h"
 
-#define DEBUG
-
 #define CHECK_OWNERSHIP(i, hid_pid)     \
         ((i) < FF_EFFECTS_MAX && i >= 0 && \
         test_bit(FF_PID_FLAGS_USED, &hid_pid->effects[(i)].flags) && \
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c
index 0043e6ebcd1f..7420c6b84284 100644
--- a/drivers/usb/input/touchkitusb.c
+++ b/drivers/usb/input/touchkitusb.c
@@ -30,10 +30,6 @@
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/init.h>
-
-#if !defined(DEBUG) && defined(CONFIG_USB_DEBUG)
-#define DEBUG
-#endif
 #include <linux/usb.h>
 #include <linux/usb_input.h>
 
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c
index ea0f75773ae1..aea1cfae34cc 100644
--- a/drivers/usb/input/wacom.c
+++ b/drivers/usb/input/wacom.c
@@ -52,8 +52,10 @@
  *    v1.30.1 (pi) - Added Graphire3 support
  *      v1.40 (pc) - Add support for several new devices, fix eraser reporting, ...
  *      v1.43 (pc) - Added support for Cintiq 21UX
-                   - Fixed a Graphire bug
-                   - Merged wacom_intuos3_irq into wacom_intuos_irq
+ *                 - Fixed a Graphire bug
+ *                 - Merged wacom_intuos3_irq into wacom_intuos_irq
+ *      v1.44 (pc) - Added support for Graphire4, Cintiq 710, Intuos3 6x11, etc.
+ *                 - Report Device IDs
  */
 
 /*
@@ -76,7 +78,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v1.43"
+#define DRIVER_VERSION "v1.44"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"
 #define DRIVER_LICENSE "GPL"
@@ -86,10 +88,14 @@ MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE(DRIVER_LICENSE);
 
 #define USB_VENDOR_ID_WACOM     0x056a
+#define STYLUS_DEVICE_ID        0x02
+#define CURSOR_DEVICE_ID        0x06
+#define ERASER_DEVICE_ID        0x0A
 
 enum {
         PENPARTNER = 0,
         GRAPHIRE,
+        G4,
         PL,
         INTUOS,
         INTUOS3,
@@ -116,6 +122,7 @@ struct wacom {
         struct urb *irq;
         struct wacom_features *features;
         int tool[2];
+        int id[2];
         __u32 serial[2];
         char phys[32];
 };
@@ -136,7 +143,7 @@ static void wacom_pl_irq(struct urb *urb, struct pt_regs *regs)
         struct wacom *wacom = urb->context;
         unsigned char *data = wacom->data;
         struct input_dev *dev = wacom->dev;
-        int prox, pressure;
+        int prox, pressure, id;
         int retval;
 
         switch (urb->status) {
@@ -163,6 +170,7 @@ static void wacom_pl_irq(struct urb *urb, struct pt_regs *regs)
 
         input_regs(dev, regs);
 
+        id = ERASER_DEVICE_ID;
         if (prox) {
 
                 pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
@@ -177,11 +185,15 @@ static void wacom_pl_irq(struct urb *urb, struct pt_regs *regs)
                  * an out of proximity for previous tool then a in for new tool.
                  */
                 if (!wacom->tool[0]) {
-                        /* Going into proximity select tool */
-                        wacom->tool[1] = (data[4] & 0x20)? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
+                        /* Eraser bit set for DTF */
+                        if (data[1] & 0x10)
+                                wacom->tool[1] = BTN_TOOL_RUBBER;
+                        else
+                                /* Going into proximity select tool */
+                                wacom->tool[1] = (data[4] & 0x20) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN;
                 } else {
                         /* was entered with stylus2 pressed */
-                        if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20) ) {
+                        if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[4] & 0x20)) {
                                 /* report out proximity for previous tool */
                                 input_report_key(dev, wacom->tool[1], 0);
                                 input_sync(dev);
@@ -192,8 +204,9 @@ static void wacom_pl_irq(struct urb *urb, struct pt_regs *regs)
                 if (wacom->tool[1] != BTN_TOOL_RUBBER) {
                         /* Unknown tool selected default to pen tool */
                         wacom->tool[1] = BTN_TOOL_PEN;
+                        id = STYLUS_DEVICE_ID;
                 }
-                input_report_key(dev, wacom->tool[1], prox); /* report in proximity for tool */
+                input_report_key(dev, wacom->tool[1], id); /* report in proximity for tool */
                 input_report_abs(dev, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
                 input_report_abs(dev, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
                 input_report_abs(dev, ABS_PRESSURE, pressure);
@@ -250,10 +263,10 @@ static void wacom_ptu_irq(struct urb *urb, struct pt_regs *regs)
 
         input_regs(dev, regs);
         if (data[1] & 0x04) {
-                input_report_key(dev, BTN_TOOL_RUBBER, data[1] & 0x20);
+                input_report_key(dev, BTN_TOOL_RUBBER, (data[1] & 0x20) ? ERASER_DEVICE_ID : 0);
                 input_report_key(dev, BTN_TOUCH, data[1] & 0x08);
         } else {
-                input_report_key(dev, BTN_TOOL_PEN, data[1] & 0x20);
+                input_report_key(dev, BTN_TOOL_PEN, (data[1] & 0x20) ? STYLUS_DEVICE_ID : 0);
                 input_report_key(dev, BTN_TOUCH, data[1] & 0x01);
         }
         input_report_abs(dev, ABS_X, le16_to_cpu(*(__le16 *) &data[2]));
@@ -299,7 +312,7 @@ static void wacom_penpartner_irq(struct urb *urb, struct pt_regs *regs)
         }
 
         input_regs(dev, regs);
-        input_report_key(dev, BTN_TOOL_PEN, 1);
+        input_report_key(dev, BTN_TOOL_PEN, STYLUS_DEVICE_ID);
         input_report_abs(dev, ABS_X, le16_to_cpu(*(__le16 *) &data[1]));
         input_report_abs(dev, ABS_Y, le16_to_cpu(*(__le16 *) &data[3]));
         input_report_abs(dev, ABS_PRESSURE, (signed char)data[6] + 127);
@@ -319,7 +332,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
         struct wacom *wacom = urb->context;
         unsigned char *data = wacom->data;
         struct input_dev *dev = wacom->dev;
-        int x, y;
+        int x, y, id, rw;
         int retval;
 
         switch (urb->status) {
@@ -344,6 +357,7 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 
         input_regs(dev, regs);
 
+        id = STYLUS_DEVICE_ID;
         if (data[1] & 0x10) { /* in prox */
 
                 switch ((data[1] >> 5) & 3) {
@@ -354,18 +368,27 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
 
                         case 1: /* Rubber */
                                 wacom->tool[0] = BTN_TOOL_RUBBER;
+                                id = ERASER_DEVICE_ID;
                                 break;
 
                         case 2: /* Mouse with wheel */
                                 input_report_key(dev, BTN_MIDDLE, data[1] & 0x04);
-                                input_report_rel(dev, REL_WHEEL, (signed char) data[6]);
+                                if (wacom->features->type == G4) {
+                                        rw = data[7] & 0x04 ? -(data[7] & 0x03) : (data[7] & 0x03);
+                                        input_report_rel(dev, REL_WHEEL, rw);
+                                } else
+                                        input_report_rel(dev, REL_WHEEL, (signed char) data[6]);
                                 /* fall through */
 
                         case 3: /* Mouse without wheel */
                                 wacom->tool[0] = BTN_TOOL_MOUSE;
+                                id = CURSOR_DEVICE_ID;
                                 input_report_key(dev, BTN_LEFT, data[1] & 0x01);
                                 input_report_key(dev, BTN_RIGHT, data[1] & 0x02);
-                                input_report_abs(dev, ABS_DISTANCE, data[7]);
+                                if (wacom->features->type == G4)
+                                        input_report_abs(dev, ABS_DISTANCE, data[6]);
+                                else
+                                        input_report_abs(dev, ABS_DISTANCE, data[7]);
                                 break;
                 }
         }
@@ -376,16 +399,50 @@ static void wacom_graphire_irq(struct urb *urb, struct pt_regs *regs)
                 input_report_abs(dev, ABS_X, x);
                 input_report_abs(dev, ABS_Y, y);
                 if (wacom->tool[0] != BTN_TOOL_MOUSE) {
-                        input_report_abs(dev, ABS_PRESSURE, le16_to_cpu(*(__le16 *) &data[6]));
+                        input_report_abs(dev, ABS_PRESSURE, data[6] | ((data[7] & 0x01) << 8));
                         input_report_key(dev, BTN_TOUCH, data[1] & 0x01);
                         input_report_key(dev, BTN_STYLUS, data[1] & 0x02);
                         input_report_key(dev, BTN_STYLUS2, data[1] & 0x04);
                 }
         }
 
-        input_report_key(dev, wacom->tool[0], data[1] & 0x10);
+        input_report_key(dev, wacom->tool[0], (data[1] & 0x10) ? id : 0);
         input_sync(dev);
 
+        /* send pad data */
+        if (wacom->features->type == G4) {
+                /* fist time sending pad data */
+                if (wacom->tool[1] != BTN_TOOL_FINGER) {
+                        wacom->id[1] = 0;
+                        wacom->serial[1] = (data[7] & 0x38) >> 2;
+                }
+                if (data[7] & 0xf8) {
+                        input_report_key(dev, BTN_0, (data[7] & 0x40));
+                        input_report_key(dev, BTN_4, (data[7] & 0x80));
+                        if (((data[7] & 0x38) >> 2) == (wacom->serial[1] & 0x0e))
+                                /* alter REL_WHEEL value so X apps can get it */
+                                wacom->serial[1] += (wacom->serial[1] & 0x01) ? -1 : 1;
+                        else
+                                 wacom->serial[1] = (data[7] & 0x38 ) >> 2;
+
+                        /* don't alter the value when there is no wheel event */
+                        if (wacom->serial[1] == 1)
+                                wacom->serial[1] = 0;
+                        rw = wacom->serial[1];
+                        rw = (rw & 0x08) ? -(rw & 0x07) : (rw & 0x07);
+                        input_report_rel(dev, REL_WHEEL, rw);
+                        wacom->tool[1] = BTN_TOOL_FINGER;
+                        wacom->id[1] = data[7] & 0xf8;
+                        input_report_key(dev, wacom->tool[1], 0xf0);
+                        input_event(dev, EV_MSC, MSC_SERIAL, 0xf0);
+                } else if (wacom->id[1]) {
+                        wacom->id[1] = 0;
+                        wacom->serial[1] = 0;
+                        input_report_key(dev, wacom->tool[1], 0);
+                        input_event(dev, EV_MSC, MSC_SERIAL, 0xf0);
+                }
+                input_sync(dev);
+        }
  exit:
         retval = usb_submit_urb (urb, GFP_ATOMIC);
         if (retval)
@@ -410,7 +467,8 @@ static int wacom_intuos_inout(struct urb *urb)
                         (data[4] << 20) + (data[5] << 12) +
                         (data[6] << 4) + (data[7] >> 4);
 
-                switch ((data[2] << 4) | (data[3] >> 4)) {
+                wacom->id[idx] = (data[2] << 4) | (data[3] >> 4);
+                switch (wacom->id[idx]) {
                         case 0x812: /* Inking pen */
                         case 0x801: /* Intuos3 Inking pen */
                         case 0x012:
@@ -458,7 +516,7 @@ static int wacom_intuos_inout(struct urb *urb)
                         default: /* Unknown tool */
                                 wacom->tool[idx] = BTN_TOOL_PEN;
                 }
-                input_report_key(dev, wacom->tool[idx], 1);
+                input_report_key(dev, wacom->tool[idx], wacom->id[idx]);
                 input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
                 input_sync(dev);
                 return 1;
@@ -637,7 +695,7 @@ static void wacom_intuos_irq(struct urb *urb, struct pt_regs *regs)
                 }
         }
 
-        input_report_key(dev, wacom->tool[idx], 1);
+        input_report_key(dev, wacom->tool[idx], wacom->id[idx]);
         input_event(dev, EV_MSC, MSC_SERIAL, wacom->serial[idx]);
         input_sync(dev);
 
@@ -655,6 +713,13 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, GRAPHIRE,   wacom_graphire_irq },
         { "Wacom Graphire3",     8,  10208,  7424,  511, 32, GRAPHIRE,   wacom_graphire_irq },
         { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 32, GRAPHIRE,   wacom_graphire_irq },
+        { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 32, G4,         wacom_graphire_irq },
+        { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 32, G4,         wacom_graphire_irq },
+        { "Wacom Volito",        8,   5104,  3712,  511, 32, GRAPHIRE,   wacom_graphire_irq },
+        { "Wacom PenStation2",   8,   3250,  2320,  255, 32, GRAPHIRE,   wacom_graphire_irq },
+        { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 32, GRAPHIRE,   wacom_graphire_irq },
+        { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 32, GRAPHIRE,   wacom_graphire_irq },
+        { "Wacom PenPartner2",   8,   3250,  2320,  255, 32, GRAPHIRE,   wacom_graphire_irq },
         { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 15, INTUOS,     wacom_intuos_irq },
@@ -666,16 +731,20 @@ static struct wacom_features wacom_features[] = {
         { "Wacom PL600SX",       8,   6260,  5016,  255, 32, PL,         wacom_pl_irq },
         { "Wacom PL550",         8,   6144,  4608,  511, 32, PL,         wacom_pl_irq },
         { "Wacom PL800",         8,   7220,  5780,  511, 32, PL,         wacom_pl_irq },
+        { "Wacom PL700",         8,   6758,  5406,  511, 32, PL,         wacom_pl_irq },
+        { "Wacom PL510",         8,   6282,  4762,  511, 32, PL,         wacom_pl_irq },
+        { "Wacom PL710",         8,  34080, 27660,  511, 32, PL,         wacom_pl_irq },
+        { "Wacom DTF720",        8,   6858,  5506,  511, 32, PL,         wacom_pl_irq },
+        { "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, PL,         wacom_ptu_irq },
         { "Wacom Intuos2 4x5",   10, 12700, 10600, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos2 9x12",  10, 30480, 24060, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos2 12x12", 10, 30480, 31680, 1023, 15, INTUOS,     wacom_intuos_irq },
         { "Wacom Intuos2 12x18", 10, 45720, 31680, 1023, 15, INTUOS,     wacom_intuos_irq },
-        { "Wacom Volito",        8,   5104,  3712,  511, 32, GRAPHIRE,   wacom_graphire_irq },
-        { "Wacom Cintiq Partner",8,  20480, 15360,  511, 32, PL,         wacom_ptu_irq },
         { "Wacom Intuos3 4x5",   10, 25400, 20320, 1023, 15, INTUOS3,    wacom_intuos_irq },
         { "Wacom Intuos3 6x8",   10, 40640, 30480, 1023, 15, INTUOS3,    wacom_intuos_irq },
         { "Wacom Intuos3 9x12",  10, 60960, 45720, 1023, 15, INTUOS3,    wacom_intuos_irq },
+        { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 15, INTUOS3,    wacom_intuos_irq },
         { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 15, CINTIQ,     wacom_intuos_irq },
         { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 15, INTUOS,     wacom_intuos_irq },
         { }
@@ -688,6 +757,13 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },
@@ -699,16 +775,20 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x33) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x34) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x35) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x37) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x38) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x39) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC0) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x41) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x42) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x43) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x44) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x45) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
-        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x03) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB0) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB1) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB2) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
         { }
@@ -779,6 +859,13 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i
         input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom->features->pressure_max, 0, 0);
 
         switch (wacom->features->type) {
+                case G4:
+                        input_dev->evbit[0] |= BIT(EV_MSC);
+                        input_dev->mscbit[0] |= BIT(MSC_SERIAL);
+                        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
+                        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3) | BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
+                        /* fall through */
+
                 case GRAPHIRE:
                         input_dev->evbit[0] |= BIT(EV_REL);
                         input_dev->relbit[0] |= BIT(REL_WHEEL);
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 862e40a83689..6c693bc68e2e 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -18,4 +18,8 @@ obj-$(CONFIG_USB_RIO500)	+= rio500.o
 obj-$(CONFIG_USB_TEST)          += usbtest.o
 obj-$(CONFIG_USB_USS720)        += uss720.o
 
-obj-$(CONFIG_USB_SISUSBVGA)     += sisusbvga/
\ No newline at end of file
+obj-$(CONFIG_USB_SISUSBVGA)     += sisusbvga/
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 5f33f7c64885..2a28ceeaa66a 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/wait.h>
-#undef DEBUG            /* include debug macros until it's done */
 #include <linux/usb.h>
 
 /*-------------------------------------------------------------------*/
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index b84eda631ab5..a30d4a6ee824 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -26,9 +26,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_USB_DEBUG
-#define DEBUG   1
-#endif
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 7d02d8ec6b1a..9590dbac5d9a 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -393,7 +393,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                                       ibuf, this_read, &partial,
                                       8000);
 
-                dbg(KERN_DEBUG "read stats: result:%d this_read:%u partial:%u",
+                dbg("read stats: result:%d this_read:%u partial:%u",
                        result, this_read, partial);
 
                 if (partial) {
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index f6ba4c788dbc..3c93921cb6b3 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -10,9 +10,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_USB_DEBUG
-        #define DEBUG   1
-#endif
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 2997f558159b..605a2afe34ed 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1,7 +1,4 @@
 #include <linux/config.h>
-#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG)
-#   define DEBUG
-#endif
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 0592cb5e6c4d..1cabe7ed91f5 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -41,8 +41,6 @@
 
 /*****************************************************************************/
 
-#define DEBUG
-
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/parport.h>
diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index 222c0495f791..a21e6eaabaf6 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -16,3 +16,7 @@ obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
 obj-$(CONFIG_USB_NET_ZAURUS)    += zaurus.o
 obj-$(CONFIG_USB_USBNET)        += usbnet.o
 obj-$(CONFIG_USB_ZD1201)        += zd1201.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index 252a34fbb42c..542120ef1fd2 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -23,9 +23,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/sched.h>
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c
index 652b04bbf6af..c008c981862b 100644
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/usb/net/cdc_ether.c
@@ -21,9 +21,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/cdc_subset.c b/drivers/usb/net/cdc_subset.c
index f1730b685fd2..f05cfb83c82d 100644
--- a/drivers/usb/net/cdc_subset.c
+++ b/drivers/usb/net/cdc_subset.c
@@ -18,9 +18,6 @@
  */
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/sched.h>
diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c
index c0f263b202a6..2455e9a85674 100644
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
@@ -22,9 +22,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index 6bef1be6b36c..b5776518020f 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -219,7 +219,6 @@ struct kaweth_device
 
         __u32 status;
         int end;
-        int removed;
         int suspend_lowmem_rx;
         int suspend_lowmem_ctrl;
         int linkstate;
@@ -699,6 +698,7 @@ static int kaweth_close(struct net_device *net)
 
         usb_kill_urb(kaweth->irq_urb);
         usb_kill_urb(kaweth->rx_urb);
+        usb_kill_urb(kaweth->tx_urb);
 
         flush_scheduled_work();
 
@@ -750,13 +750,6 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net)
 
         spin_lock(&kaweth->device_lock);
 
-        if (kaweth->removed) {
-        /* our device is undergoing disconnection - we bail out */
-                spin_unlock(&kaweth->device_lock);
-                dev_kfree_skb_irq(skb);
-                return 0;
-        }
-
         kaweth_async_set_rx_mode(kaweth);
         netif_stop_queue(net);
 
@@ -1136,10 +1129,6 @@ static void kaweth_disconnect(struct usb_interface *intf)
                 return;
         }
         netdev = kaweth->net;
-        kaweth->removed = 1;
-        usb_kill_urb(kaweth->irq_urb);
-        usb_kill_urb(kaweth->rx_urb);
-        usb_kill_urb(kaweth->tx_urb);
 
         kaweth_dbg("Unregistering net device");
         unregister_netdev(netdev);
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index cee55f8cf64f..b3799b1a2b0d 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -21,9 +21,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index 537eb181d985..683e3df5d607 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -28,8 +28,6 @@
  *                      is out of the interrupt routine.
  */
 
-#undef  DEBUG
-
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/plusb.c b/drivers/usb/net/plusb.c
index 74c2b3581c76..89856aa0e3b8 100644
--- a/drivers/usb/net/plusb.c
+++ b/drivers/usb/net/plusb.c
@@ -21,9 +21,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c
index b5a925dc1beb..c0ecbab6f6ba 100644
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/usb/net/rndis_host.c
@@ -21,9 +21,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 74f05c9c84d5..362d6907c9bb 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -34,9 +34,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/net/zaurus.c b/drivers/usb/net/zaurus.c
index 5d4b7d55b097..680d13957af4 100644
--- a/drivers/usb/net/zaurus.c
+++ b/drivers/usb/net/zaurus.c
@@ -21,9 +21,6 @@
 // #define      VERBOSE                 // more; success messages
 
 #include <linux/config.h>
-#ifdef  CONFIG_USB_DEBUG
-#   define DEBUG
-#endif
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/drivers/usb/serial/ChangeLog.old b/drivers/usb/serial/ChangeLog.history
index c1b279939bbf..52c4f7bd7a80 100644
--- a/drivers/usb/serial/ChangeLog.old
+++ b/drivers/usb/serial/ChangeLog.history
@@ -400,7 +400,7 @@ visor.c Change Log comments:
 
  (11/11/2001) gkh
         Added support for the m125 devices, and added check to prevent oopses
-        for Clié devices that lie about the number of ports they have.
+        for Clié devices that lie about the number of ports they have.
 
  (08/30/2001) gkh
         Added support for the Clie devices, both the 3.5 and 4.0 os versions.
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 7b5e8e4ee2bb..14f55fd26a64 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,6 +62,15 @@ config USB_SERIAL_AIRPRIME
           To compile this driver as a module, choose M here: the
           module will be called airprime.
 
+config USB_SERIAL_ANYDATA
+        tristate "USB AnyData CDMA Wireless Driver"
+        depends on USB_SERIAL
+        help
+          Say Y here if you want to use a AnyData CDMA device.
+
+          To compile this driver as a module, choose M here: the
+          module will be called anydata.
+
 config USB_SERIAL_BELKIN
         tristate "USB Belkin and Peracom Single Port Serial Driver"
         depends on USB_SERIAL
@@ -394,15 +403,6 @@ config USB_SERIAL_MCT_U232
           To compile this driver as a module, choose M here: the
           module will be called mct_u232.
 
-config USB_SERIAL_NOKIA_DKU2
-        tristate "USB Nokia DKU2 Driver"
-        depends on USB_SERIAL
-        help
-          Say Y here if you want to use a Nokia DKU2 device.
-
-          To compile this driver as a module, choose M here: the
-          module will be called nokia_dku2.
-
 config USB_SERIAL_PL2303
         tristate "USB Prolific 2303 Single Port Serial Driver"
         depends on USB_SERIAL
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 55fd461793b7..f0b04420cea1 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -12,6 +12,7 @@ usbserial-obj-$(CONFIG_USB_EZUSB)		+= ezusb.o
 usbserial-objs  := usb-serial.o generic.o bus.o $(usbserial-obj-y)
 
 obj-$(CONFIG_USB_SERIAL_AIRPRIME)               += airprime.o
+obj-$(CONFIG_USB_SERIAL_ANYDATA)                += anydata.o
 obj-$(CONFIG_USB_SERIAL_BELKIN)                 += belkin_sa.o
 obj-$(CONFIG_USB_SERIAL_CP2101)                 += cp2101.o
 obj-$(CONFIG_USB_SERIAL_CYBERJACK)              += cyberjack.o
@@ -31,7 +32,6 @@ obj-$(CONFIG_USB_SERIAL_KEYSPAN_PDA)		+= keyspan_pda.o
 obj-$(CONFIG_USB_SERIAL_KLSI)                   += kl5kusb105.o
 obj-$(CONFIG_USB_SERIAL_KOBIL_SCT)              += kobil_sct.o
 obj-$(CONFIG_USB_SERIAL_MCT_U232)               += mct_u232.o
-obj-$(CONFIG_USB_SERIAL_NOKIA_DKU2)             += nokia_dku2.o
 obj-$(CONFIG_USB_SERIAL_OMNINET)                += omninet.o
 obj-$(CONFIG_USB_SERIAL_OPTION)                 += option.o
 obj-$(CONFIG_USB_SERIAL_PL2303)                 += pl2303.o
diff --git a/drivers/usb/serial/anydata.c b/drivers/usb/serial/anydata.c
new file mode 100644
index 000000000000..18022a74a3dc
--- /dev/null
+++ b/drivers/usb/serial/anydata.c
@@ -0,0 +1,123 @@
+/*
+ * AnyData CDMA Serial USB driver
+ *
+ * Copyright (C) 2005 Greg Kroah-Hartman <gregkh@suse.de>
+ *
+ *      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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include "usb-serial.h"
+
+static struct usb_device_id id_table [] = {
+        { USB_DEVICE(0x16d5, 0x6501) }, /* AirData CDMA device */
+        { },
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+/* if overridden by the user, then use their value for the size of the
+ * read and write urbs */
+static int buffer_size;
+static int debug;
+
+static struct usb_driver anydata_driver = {
+        .owner =        THIS_MODULE,
+        .name =         "anydata",
+        .probe =        usb_serial_probe,
+        .disconnect =   usb_serial_disconnect,
+        .id_table =     id_table,
+};
+
+static int anydata_open(struct usb_serial_port *port, struct file *filp)
+{
+        char *buffer;
+        int result = 0;
+
+        dbg("%s - port %d", __FUNCTION__, port->number);
+
+        if (buffer_size) {
+                /* override the default buffer sizes */
+                buffer = kmalloc(buffer_size, GFP_KERNEL);
+                if (!buffer) {
+                        dev_err(&port->dev, "%s - out of memory.\n",
+                                __FUNCTION__);
+                        return -ENOMEM;
+                }
+                kfree (port->read_urb->transfer_buffer);
+                port->read_urb->transfer_buffer = buffer;
+                port->read_urb->transfer_buffer_length = buffer_size;
+
+                buffer = kmalloc(buffer_size, GFP_KERNEL);
+                if (!buffer) {
+                        dev_err(&port->dev, "%s - out of memory.\n",
+                                __FUNCTION__);
+                        return -ENOMEM;
+                }
+                kfree (port->write_urb->transfer_buffer);
+                port->write_urb->transfer_buffer = buffer;
+                port->write_urb->transfer_buffer_length = buffer_size;
+                port->bulk_out_size = buffer_size;
+        }
+
+        /* Start reading from the device */
+        usb_fill_bulk_urb(port->read_urb, port->serial->dev,
+                          usb_rcvbulkpipe(port->serial->dev,
+                                          port->bulk_in_endpointAddress),
+                          port->read_urb->transfer_buffer,
+                          port->read_urb->transfer_buffer_length,
+                          usb_serial_generic_write_bulk_callback, port);
+        result = usb_submit_urb(port->read_urb, GFP_KERNEL);
+        if (result)
+                dev_err(&port->dev,
+                        "%s - failed submitting read urb, error %d\n",
+                        __FUNCTION__, result);
+
+        return result;
+}
+
+static struct usb_serial_driver anydata_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "anydata",
+        },
+        .id_table =             id_table,
+        .num_interrupt_in =     NUM_DONT_CARE,
+        .num_bulk_in =          NUM_DONT_CARE,
+        .num_bulk_out =         NUM_DONT_CARE,
+        .num_ports =            1,
+        .open =                 anydata_open,
+};
+
+static int __init anydata_init(void)
+{
+        int retval;
+
+        retval = usb_serial_register(&anydata_device);
+        if (retval)
+                return retval;
+        retval = usb_register(&anydata_driver);
+        if (retval)
+                usb_serial_deregister(&anydata_device);
+        return retval;
+}
+
+static void __exit anydata_exit(void)
+{
+        usb_deregister(&anydata_driver);
+        usb_serial_deregister(&anydata_device);
+}
+
+module_init(anydata_init);
+module_exit(anydata_exit);
+MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
+module_param(buffer_size, int, 0);
+MODULE_PARM_DESC(buffer_size, "Size of the transfer buffers");
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index c5334dd89b12..c9787001cf2a 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -60,6 +60,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
         { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
         { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
+        { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
         { } /* Terminating Entry */
 };
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 8909208f506a..53a47c31cd0e 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -309,6 +309,7 @@ void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *re
 
         schedule_work(&port->work);
 }
+EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
 
 void usb_serial_generic_shutdown (struct usb_serial *serial)
 {
diff --git a/drivers/usb/serial/nokia_dku2.c b/drivers/usb/serial/nokia_dku2.c
deleted file mode 100644
index fad01bef3a64..000000000000
--- a/drivers/usb/serial/nokia_dku2.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  Nokia DKU2 USB driver
- *
- *  Copyright (C) 2004
- *  Author: C Kemp
- *
- *  This program is largely derived from work by the linux-usb group
- *  and associated source files.  Please see the usb/serial files for
- *  individual credits and copyrights.
- *
- *  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.
- *
- *  20.09.2005 - Matthias Blaesing <matthias.blaesing@rwth-aachen.de>
- *  Added short name to device structure to make driver load into kernel 2.6.13
- *
- *  20.09.2005 - Matthias Blaesing <matthias.blaesing@rwth-aachen.de>
- *  Added usb_deregister to exit code - to allow remove and reinsert of module
- */
-
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include "usb-serial.h"
-
-
-#define NOKIA_VENDOR_ID         0x0421
-#define NOKIA7600_PRODUCT_ID    0x0400
-#define NOKIA6230_PRODUCT_ID    0x040f
-#define NOKIA6170_PRODUCT_ID    0x0416
-#define NOKIA6670_PRODUCT_ID    0x041d
-#define NOKIA6680_PRODUCT_ID    0x041e
-#define NOKIA6230i_PRODUCT_ID   0x0428
-
-#define NOKIA_AT_PORT   0x82
-#define NOKIA_FBUS_PORT 0x86
-
-/*
- * Version Information
- */
-#define DRIVER_VERSION  "v0.2"
-#define DRIVER_AUTHOR   "C Kemp"
-#define DRIVER_DESC     "Nokia DKU2 Driver"
-
-static struct usb_device_id id_table [] = {
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA7600_PRODUCT_ID) },
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230_PRODUCT_ID) },
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6170_PRODUCT_ID) },
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6670_PRODUCT_ID) },
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6680_PRODUCT_ID) },
-        { USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230i_PRODUCT_ID) },
-        { }                     /* Terminating entry */
-};
-MODULE_DEVICE_TABLE(usb, id_table);
-
-/* The only thing which makes this device different from a generic
- * device is that we have to set an alternative configuration to make
- * the relevant endpoints available. In 2.6 this is really easy... */
-static int nokia_probe(struct usb_serial *serial,
-                       const struct usb_device_id *id)
-{
-        int retval = -ENODEV;
-
-        if (serial->interface->altsetting[0].endpoint[0].desc.bEndpointAddress == NOKIA_AT_PORT) {
-                /* the AT port */
-                dev_info(&serial->dev->dev, "Nokia AT Port:\n");
-                retval = 0;
-        } else if (serial->interface->num_altsetting == 2 &&
-                   serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == NOKIA_FBUS_PORT) {
-                /* the FBUS port */
-                dev_info(&serial->dev->dev, "Nokia FBUS Port:\n");
-                usb_set_interface(serial->dev, 10, 1);
-                retval = 0;
-        }
-
-        return retval;
-}
-
-static struct usb_driver nokia_driver = {
-        .owner =        THIS_MODULE,
-        .name =         "nokia_dku2",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table,
-};
-
-static struct usb_serial_driver nokia_serial_driver = {
-        .driver = {
-                .owner =        THIS_MODULE,
-                .name =         "nokia_dku2",
-        },
-        .description =          "Nokia 7600/6230(i)/6170/66x0 DKU2 driver",
-        .id_table =             id_table,
-        .num_interrupt_in =     1,
-        .num_bulk_in =          1,
-        .num_bulk_out =         1,
-        .num_ports =            1,
-        .probe =                nokia_probe,
-};
-
-static int __init nokia_init(void)
-{
-        int retval;
-
-        retval = usb_serial_register(&nokia_serial_driver);
-        if (retval)
-                return retval;
-
-        retval = usb_register(&nokia_driver);
-        if (retval) {
-                usb_serial_deregister(&nokia_serial_driver);
-                return retval;
-        }
-
-        info(DRIVER_VERSION " " DRIVER_AUTHOR);
-        info(DRIVER_DESC);
-
-        return retval;
-}
-
-static void __exit nokia_exit(void)
-{
-        usb_deregister(&nokia_driver);
-        usb_serial_deregister(&nokia_serial_driver);
-}
-
-module_init(nokia_init);
-module_exit(nokia_exit);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 165c119bf10e..41a45a5025b2 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -71,7 +71,9 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) },
         { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) },
+        { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_SX1) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
+        { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
         { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
         { USB_DEVICE( NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID ) },
         { }                                     /* Terminating entry */
@@ -811,7 +813,9 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
         u8 length = UART_STATE;
 
         if ((le16_to_cpu(port->serial->dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) &&
-            (le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X65)) {
+            (le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X65 ||
+             le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_SX1 ||
+             le16_to_cpu(port->serial->dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_X75)) {
                 length = 1;
                 status_idx = 0;
         }
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 7be9644f5a03..21d434d81813 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -54,7 +54,9 @@
 #define SAMSUNG_PRODUCT_ID      0x8001
 
 #define SIEMENS_VENDOR_ID       0x11f5
+#define SIEMENS_PRODUCT_ID_SX1  0x0001
 #define SIEMENS_PRODUCT_ID_X65  0x0003
+#define SIEMENS_PRODUCT_ID_X75  0x0004
 
 #define SYNTECH_VENDOR_ID       0x0745
 #define SYNTECH_PRODUCT_ID      0x0001
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 1a9679f76f5a..c41d64dbb0f0 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -115,7 +115,7 @@ config USB_STORAGE_JUMPSHOT
 
 config USB_STORAGE_ONETOUCH
         bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
-        depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL
+        depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
         help
           Say Y here to include additional code to support the Maxtor OneTouch
           USB hard drive's onetouch button.
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index 33c55a6261bb..fea176d7e79a 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -853,7 +853,7 @@ static int usbat_identify_device(struct us_data *us,
         rc = usbat_device_reset(us);
         if (rc != USB_STOR_TRANSPORT_GOOD)
                 return rc;
-        msleep(25);
+        msleep(500);
 
         /*
          * In attempt to distinguish between HP CDRW's and Flash readers, we now
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 9e926a8f2116..0a9858f69a9b 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -710,11 +710,6 @@ UNUSUAL_DEV(  0x0686, 0x4017, 0x0001, 0x0001,
                 "DIMAGE E223",
                 US_SC_SCSI, US_PR_DEVICE, NULL, 0 ),
 
-UNUSUAL_DEV(  0x0693, 0x0002, 0x0100, 0x0100, 
-                "Hagiwara",
-                "FlashGate SmartMedia",
-                US_SC_SCSI, US_PR_BULK, NULL, 0 ),
-
 UNUSUAL_DEV(  0x0693, 0x0005, 0x0100, 0x0100,
                 "Hagiwara",
                 "Flashgate",
@@ -1008,6 +1003,11 @@ UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
  *
  */
 #ifdef CONFIG_USB_STORAGE_ONETOUCH
+        UNUSUAL_DEV(  0x0d49, 0x7000, 0x0000, 0x9999,
+                        "Maxtor",
+                        "OneTouch External Harddrive",
+                        US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input,
+                        0),
         UNUSUAL_DEV(  0x0d49, 0x7010, 0x0000, 0x9999,
                         "Maxtor",
                         "OneTouch External Harddrive",
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 2c856838694e..00d87f5bb7be 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -26,6 +26,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 
@@ -325,8 +326,8 @@ static void __init offb_init_nodriver(struct device_node *dp)
         int *pp, i;
         unsigned int len;
         int width = 640, height = 480, depth = 8, pitch;
-        unsigned *up;
-        unsigned long address;
+        unsigned int rsize, *up;
+        unsigned long address = 0;
 
         if ((pp = (int *) get_property(dp, "depth", &len)) != NULL
             && len == sizeof(int))
@@ -344,10 +345,40 @@ static void __init offb_init_nodriver(struct device_node *dp)
                         pitch = 0x1000;
         } else
                 pitch = width;
-        if ((up = (unsigned *) get_property(dp, "address", &len)) != NULL
-            && len == sizeof(unsigned))
+
+       rsize = (unsigned long)pitch * (unsigned long)height *
+               (unsigned long)(depth / 8);
+
+       /* Try to match device to a PCI device in order to get a properly
+        * translated address rather then trying to decode the open firmware
+        * stuff in various incorrect ways
+        */
+#ifdef CONFIG_PCI
+       /* First try to locate the PCI device if any */
+       {
+               struct pci_dev *pdev = NULL;
+
+               for_each_pci_dev(pdev) {
+                       if (dp == pci_device_to_OF_node(pdev))
+                               break;
+               }
+               if (pdev) {
+                       for (i = 0; i < 6 && address == 0; i++) {
+                               if ((pci_resource_flags(pdev, i) &
+                                    IORESOURCE_MEM) &&
+                                   (pci_resource_len(pdev, i) >= rsize))
+                                       address = pci_resource_start(pdev, i);
+                       }
+                       pci_dev_put(pdev);
+               }
+        }
+#endif /* CONFIG_PCI */
+
+        if (address == 0 &&
+            (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
+            len == sizeof(unsigned))
                 address = (u_long) * up;
-        else {
+        if (address == 0) {
                 for (i = 0; i < dp->n_addrs; ++i)
                         if (dp->addrs[i].size >=
                             pitch * height * depth / 8)