Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

diff --combined MAINTAINERS
index 9b788d77947217dade28bff268a7551d729a17c4,8024d1b70065610caa34ad5f130e2212a34c64d4..07420161e669054211c639cedf55c56127ccb943
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -546,6 -546,13 +546,6 @@@ W:        http://linuxtv.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
  S:    Maintained
  
 -BUSLOGIC SCSI DRIVER
 -P:    Leonard N. Zubkoff
 -M:    Leonard N. Zubkoff <[email protected]>
 -L:    [email protected]
 -W:    http://www.dandelion.com/Linux/
 -S:    Maintained
 -
  COMMON INTERNET FILE SYSTEM (CIFS)
  P:    Steve French
  M:    [email protected]
@@@ -1987,6 -1994,13 +1987,13 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
+ PCI ERROR RECOVERY
+ P:    Linas Vepstas
+ M:    [email protected]
+ L:    [email protected]
+ L:    [email protected]
+ S:    Supported
+ 
  PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
  P:    Thomas Sailer
  M:    [email protected]

diff --combined drivers/block/sx8.c
index 4bdf95716e2b253fc45334ec079b90a0c8014a09,a7e0975c8c9f9c1da047b038c38e31250e710abb..2ae08b343b935518c86098959866299e73f213e8
--- 1/drivers/block/sx8.c
--- 2/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@@ -27,8 -27,8 +27,8 @@@
  #include <linux/time.h>
  #include <linux/hdreg.h>
  #include <linux/dma-mapping.h>
 +#include <linux/completion.h>
  #include <asm/io.h>
 -#include <asm/semaphore.h>
  #include <asm/uaccess.h>
  
  #if 0
@@@ -303,7 -303,7 +303,7 @@@ struct carm_host 
  
        struct work_struct              fsm_task;
  
 -      struct semaphore                probe_sem;
 +      struct completion               probe_comp;
  };
  
  struct carm_response {
@@@ -1346,7 -1346,7 +1346,7 @@@ static void carm_fsm_task (void *_data
        }
  
        case HST_PROBE_FINISHED:
 -              up(&host->probe_sem);
 +              complete(&host->probe_comp);
                break;
  
        case HST_ERROR:
@@@ -1622,7 -1622,7 +1622,7 @@@ static int carm_init_one (struct pci_de
        host->flags = pci_dac ? FL_DAC : 0;
        spin_lock_init(&host->lock);
        INIT_WORK(&host->fsm_task, carm_fsm_task, host);
 -      init_MUTEX_LOCKED(&host->probe_sem);
 +      init_completion(&host->probe_comp);
  
        for (i = 0; i < ARRAY_SIZE(host->req); i++)
                host->req[i].tag = i;
@@@ -1691,8 -1691,8 +1691,8 @@@
        if (rc)
                goto err_out_free_irq;
  
 -      DPRINTK("waiting for probe_sem\n");
 -      down(&host->probe_sem);
 +      DPRINTK("waiting for probe_comp\n");
 +      wait_for_completion(&host->probe_comp);
  
        printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
               host->name, pci_name(pdev), (int) CARM_MAX_PORTS,
@@@ -1755,7 -1755,7 +1755,7 @@@ static void carm_remove_one (struct pci
  
  static int __init carm_init(void)
  {
-       return pci_module_init(&carm_driver);
+       return pci_register_driver(&carm_driver);
  }
  
  static void __exit carm_exit(void)

diff --combined drivers/media/radio/radio-gemtek-pci.c
index 42c8fce04aa2650aeded8b2f6e21f9adec07ac85,78b2888bf581fcf631be2a3d9b90de2b369ab7b3..69ac8aa73eba45f2f974af726e7443a247198ec8
--- 1/drivers/media/radio/radio-gemtek-pci.c
--- 2/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@@ -301,7 -301,6 +301,7 @@@ static struct file_operations gemtek_pc
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
        .ioctl          = gemtek_pci_ioctl,
 +      .compat_ioctl   = v4l_compat_ioctl32,
        .llseek         = no_llseek,
  };
  
@@@ -395,7 -394,7 +395,7 @@@ static struct pci_driver gemtek_pci_dri
  
  static int __init gemtek_pci_init_module( void )
  {
-       return pci_module_init( &gemtek_pci_driver );
+       return pci_register_driver( &gemtek_pci_driver );
  }
  
  static void __exit gemtek_pci_cleanup_module( void )

diff --combined drivers/media/radio/radio-maxiradio.c
index 30869308332af3bff2d3af7ba6e2098f0738fe0a,7b33d8f2f8f8d9cc3a0676c751556f9d93e9a621..c975ddd86cd5257e9b8959a2f29e46381661bb1c
--- 1/drivers/media/radio/radio-maxiradio.c
--- 2/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@@ -80,7 -80,6 +80,7 @@@ static struct file_operations maxiradio
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
        .ioctl          = radio_ioctl,
 +      .compat_ioctl   = v4l_compat_ioctl32,
        .llseek         = no_llseek,
  };
  static struct video_device maxiradio_radio =
@@@ -338,7 -337,7 +338,7 @@@ static struct pci_driver maxiradio_driv
  
  static int __init maxiradio_radio_init(void)
  {
-       return pci_module_init(&maxiradio_driver);
+       return pci_register_driver(&maxiradio_driver);
  }
  
  static void __exit maxiradio_radio_exit(void)

diff --combined drivers/pci/proc.c
index 9cb6dd0834be944d7a7fd064d4dac0e7d3c47a0d,d21894c63f8e01278916abf680446de0ac3748a4..92a8857608329f26892c990e6425be88020df5c3
--- 1/drivers/pci/proc.c
--- 2/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@@ -25,7 -25,7 +25,7 @@@ proc_bus_pci_lseek(struct file *file, l
        loff_t new = -1;
        struct inode *inode = file->f_dentry->d_inode;
  
 -      down(&inode->i_sem);
 +      mutex_lock(&inode->i_mutex);
        switch (whence) {
        case 0:
                new = off;
@@@ -41,7 -41,7 +41,7 @@@
                new = -EINVAL;
        else
                file->f_pos = new;
 -      up(&inode->i_sem);
 +      mutex_unlock(&inode->i_mutex);
        return new;
  }
  
@@@ -431,6 -431,7 +431,7 @@@ int pci_proc_detach_device(struct pci_d
        return 0;
  }
  
+ #if 0
  int pci_proc_attach_bus(struct pci_bus* bus)
  {
        struct proc_dir_entry *de = bus->procdir;
@@@ -447,6 -448,7 +448,7 @@@
        }
        return 0;
  }
+ #endif  /*  0  */
  
  int pci_proc_detach_bus(struct pci_bus* bus)
  {
@@@ -612,7 -614,6 +614,6 @@@ __initcall(pci_proc_init)
  
  #ifdef CONFIG_HOTPLUG
  EXPORT_SYMBOL(pci_proc_attach_device);
- EXPORT_SYMBOL(pci_proc_attach_bus);
  EXPORT_SYMBOL(pci_proc_detach_bus);
  #endif