13 files changed, 81 insertions, 55 deletions

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index f5a47a48c3b4..5b4fab24155f 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -7,7 +7,7 @@ menuconfig ATM_DRIVERS
         depends on NETDEVICES && ATM
         default y
 
-if ATM_DRIVERS
+if ATM_DRIVERS && NETDEVICES && ATM
 
 config ATM_DUMMY
         tristate "Dummy ATM driver"
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 8e8726104619..850014139556 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -556,7 +556,7 @@ static struct pci_device_id ioat_pci_tbl[] = {
         { 0, }
 };
 
-static struct pci_driver ioat_pci_drv = {
+static struct pci_driver ioat_pci_driver = {
         .name   = "ioatdma",
         .id_table = ioat_pci_tbl,
         .probe  = ioat_probe,
@@ -699,7 +699,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
         if (err)
                 goto err_set_dma_mask;
 
-        err = pci_request_regions(pdev, ioat_pci_drv.name);
+        err = pci_request_regions(pdev, ioat_pci_driver.name);
         if (err)
                 goto err_request_regions;
 
@@ -828,14 +828,14 @@ static int __init ioat_init_module(void)
         /* if forced, worst case is that rmmod hangs */
         __unsafe(THIS_MODULE);
 
-        return pci_register_driver(&ioat_pci_drv);
+        return pci_register_driver(&ioat_pci_driver);
 }
 
 module_init(ioat_init_module);
 
 static void __exit ioat_exit_module(void)
 {
-        pci_unregister_driver(&ioat_pci_drv);
+        pci_unregister_driver(&ioat_pci_driver);
 }
 
 module_exit(ioat_exit_module);
diff --git a/drivers/media/dvb/Kconfig b/drivers/media/dvb/Kconfig
index efd2b7468158..03ef88acd9b8 100644
--- a/drivers/media/dvb/Kconfig
+++ b/drivers/media/dvb/Kconfig
@@ -11,7 +11,7 @@ menuconfig DVB_CAPTURE_DRIVERS
         ---help---
           Say Y to select Digital TV adapters
 
-if DVB_CAPTURE_DRIVERS
+if DVB_CAPTURE_DRIVERS && DVB_CORE
 
 comment "Supported SAA7146 based PCI Adapters"
         depends on DVB_CORE && PCI && I2C
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index a6ac82a609d4..194b102140ef 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -9,7 +9,7 @@ menuconfig RADIO_ADAPTERS
         ---help---
           Say Y here to enable selecting AM/FM radio adapters.
 
-if RADIO_ADAPTERS
+if RADIO_ADAPTERS && VIDEO_DEV
 
 config RADIO_CADET
         tristate "ADS Cadet AM/FM Tuner"
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 4cca55170e21..4d45a40016de 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -11,7 +11,7 @@ menuconfig VIDEO_CAPTURE_DRIVERS
           webcams, analog TV, and hybrid analog/digital TV.
           Some of those devices also supports FM radio.
 
-if VIDEO_CAPTURE_DRIVERS
+if VIDEO_CAPTURE_DRIVERS && VIDEO_DEV
 
 config VIDEO_ADV_DEBUG
         bool "Enable advanced debug functionality"
@@ -347,7 +347,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI && VIDEO_DEV
+        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI
         select VIDEO_BUF
         default n
         ---help---
@@ -691,7 +691,7 @@ menuconfig V4L_USB_DRIVERS
         depends on USB
         default y
 
-if V4L_USB_DRIVERS
+if V4L_USB_DRIVERS && USB
 
 source "drivers/media/video/pvrusb2/Kconfig"
 
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 7b56041186dc..30395d6b5f14 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -1005,7 +1005,7 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
 int saa7134_tvaudio_fini(struct saa7134_dev *dev)
 {
         /* shutdown tvaudio thread */
-        if (dev->thread.pid >= 0) {
+        if (dev->thread.pid > 0) {
                 dev->thread.shutdown = 1;
                 wake_up_interruptible(&dev->thread.wq);
                 wait_for_completion(&dev->thread.exit);
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 9043bf4aa49e..2803b370ba01 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -416,6 +416,13 @@ static int __init smsc_ircc_legacy_probe(void)
 {
         int ret = 0;
 
+#ifdef CONFIG_PCI
+        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
+                /* Ignore errors from preconfiguration */
+                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
+        }
+#endif
+
         if (ircc_fir > 0 && ircc_sir > 0) {
                 IRDA_MESSAGE(" Overriding FIR address 0x%04x\n", ircc_fir);
                 IRDA_MESSAGE(" Overriding SIR address 0x%04x\n", ircc_sir);
@@ -459,13 +466,6 @@ static int __init smsc_ircc_init(void)
                 return ret;
         }
 
-#ifdef CONFIG_PCI
-        if (smsc_ircc_preconfigure_subsystems(ircc_cfg, ircc_fir, ircc_sir, ircc_dma, ircc_irq) < 0) {
-                /* Ignore errors from preconfiguration */
-                IRDA_ERROR("%s, Preconfiguration failed !\n", driver_name);
-        }
-#endif
-
         dev_count = 0;
 
         if (smsc_nopnp || !pnp_platform_devices ||
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 5d658bc9791c..e8f55d8ed7a9 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -19,7 +19,7 @@ menuconfig NET_PCMCIA
 
           If unsure, say N.
 
-if NET_PCMCIA
+if NET_PCMCIA && PCMCIA
 
 config PCMCIA_3C589
         tristate "3Com 3c589 PCMCIA support"
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 277df50c89ae..967a8e22b2da 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -107,31 +107,61 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
         return;
 }
 
-static void quirk_smc_enable(struct pnp_dev *dev)
+static int quirk_smc_fir_enabled(struct pnp_dev *dev)
 {
-        unsigned int firbase;
+        unsigned long firbase;
+        u8 bank, high, low, chip;
+
+        if (!pnp_port_valid(dev, 1))
+                return 0;
+
+        firbase = pnp_port_start(dev, 1);
+
+        /* Select register bank 3 */
+        bank = inb(firbase + 7);
+        bank &= 0xf0;
+        bank |= 3;
+        outb(bank, firbase + 7);
+
+        high = inb(firbase + 0);
+        low  = inb(firbase + 1);
+        chip = inb(firbase + 2);
+
+        /* This corresponds to the check in smsc_ircc_present() */
+        if (high == 0x10 && low == 0xb8 && (chip == 0xf1 || chip == 0xf2))
+                return 1;
+
+        return 0;
+}
 
-        if (!dev->active || !pnp_port_valid(dev, 1))
+static void quirk_smc_enable(struct pnp_dev *dev)
+{
+        /*
+         * If the BIOS left the device disabled, or it is enabled and
+         * responding correctly, we're in good shape.
+         */
+        if (!dev->active || quirk_smc_fir_enabled(dev))
                 return;
 
         /*
-         * On the HP/Compaq nw8240 (and probably other similar machines),
-         * there is an SMCF010 device with two I/O port regions:
-         *
-         *      0x3e8-0x3ef SIR
-         *      0x100-0x10f FIR
+         * Sometimes the BIOS claims the device is enabled, but it reports
+         * the wrong FIR resources or doesn't properly configure ISA or LPC
+         * bridges on the way to the device.
          *
-         * _STA reports the device is enabled, but in fact, the BIOS
-         * neglects to enable the FIR range.  Fortunately, it does fully
-         * enable the device if we call _SRS.
+         * HP nc6000 and nc8000/nw8000 laptops have known problems like
+         * this.  Fortunately, they do fix things up if we auto-configure
+         * the device using its _PRS and _SRS methods.
          */
-        firbase = pnp_port_start(dev, 1);
-        if (inb(firbase + 0x7 /* IRCC_MASTER */) == 0xff) {
-                pnp_err("%s (%s) enabled but not responding, disabling and "
-                        "re-enabling", dev->dev.bus_id, pnp_dev_name(dev));
-                pnp_disable_dev(dev);
-                pnp_activate_dev(dev);
-        }
+        dev_err(&dev->dev, "%s device not responding, auto-configuring "
+                "resources\n", dev->id->id);
+
+        pnp_disable_dev(dev);
+        pnp_init_resource_table(&dev->res);
+        pnp_auto_config_dev(dev);
+        pnp_activate_dev(dev);
+
+        if (!quirk_smc_fir_enabled(dev))
+                dev_err(&dev->dev, "giving up; try \"smsc-ircc2.nopnp\"\n");
 }
 
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index d09f2097d5b0..00924feaf621 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -503,7 +503,8 @@ mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
 
         if (pi->mirror_regs)
                 pi->shared_regs->SDMA_INTR_CAUSE_m = 0;
-        writel(0, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE);
+        writeb(0x00, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE +
+               pi->port.line);
         return;
 }
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 8d3455da663a..2fbff6317433 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2290,15 +2290,6 @@ static int __devinit aty_init(struct fb_info *info)
         init_waitqueue_head(&par->vblank.wait);
         spin_lock_init(&par->int_lock);
 
-#ifdef CONFIG_PPC_PMAC
-        /* The Apple iBook1 uses non-standard memory frequencies. We detect it
-         * and set the frequency manually. */
-        if (machine_is_compatible("PowerBook2,1")) {
-                par->pll_limits.mclk = 70;
-                par->pll_limits.xclk = 53;
-        }
-#endif
-
 #ifdef CONFIG_FB_ATY_GX
         if (!M64_HAS(INTEGRATED)) {
                 u32 stat0;
@@ -2383,6 +2374,14 @@ static int __devinit aty_init(struct fb_info *info)
                         par->pll_limits.xclk = (par->pll_limits.xclk + 1) >> 1;
         }
 #endif
+#ifdef CONFIG_PPC_PMAC
+        /* The Apple iBook1 uses non-standard memory frequencies. We detect it
+         * and set the frequency manually. */
+        if (machine_is_compatible("PowerBook2,1")) {
+                par->pll_limits.mclk = 70;
+                par->pll_limits.xclk = 53;
+        }
+#endif
 
         /* Allow command line to override clocks. */
         if (pll)
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index af313bf1a2da..f48e8c534c87 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -292,7 +292,7 @@ static void __init chips_hw_init(void)
                 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
 }
 
-static struct fb_fix_screeninfo chipsfb_fix __initdata = {
+static struct fb_fix_screeninfo chipsfb_fix __devinitdata = {
         .id =           "C&T 65550",
         .type =         FB_TYPE_PACKED_PIXELS,
         .visual =       FB_VISUAL_PSEUDOCOLOR,
@@ -309,7 +309,7 @@ static struct fb_fix_screeninfo chipsfb_fix __initdata = {
         .smem_len =     0x100000,       /* 1MB */
 };
 
-static struct fb_var_screeninfo chipsfb_var __initdata = {
+static struct fb_var_screeninfo chipsfb_var __devinitdata = {
         .xres = 800,
         .yres = 600,
         .xres_virtual = 800,
@@ -330,7 +330,7 @@ static struct fb_var_screeninfo chipsfb_var __initdata = {
         .vsync_len = 8,
 };
 
-static void __init init_chips(struct fb_info *p, unsigned long addr)
+static void __devinit init_chips(struct fb_info *p, unsigned long addr)
 {
         memset(p->screen_base, 0, 0x100000);
 
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 732db4780042..1a6937dc190b 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -191,11 +191,7 @@ static ssize_t w1_therm_read_bin(struct kobject *kobj, char *buf, loff_t off, si
 
                         w1_write_8(dev, W1_CONVERT_TEMP);
 
-                        while (tm) {
-                                tm = msleep_interruptible(tm);
-                                if (signal_pending(current))
-                                        flush_signals(current);
-                        }
+                        msleep(tm);
 
                         if (!w1_reset_select_slave(sl)) {