From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 5 May 2007 01:04:29 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.22-rc1~1039
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89661adaaee2f85116b399e642129ccd4dafd195;p=linux-2.6

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (59 commits)
  PCI: Free resource files in error path of pci_create_sysfs_dev_files()
  pci-quirks: disable MSI on RS400-200 and RS480
  PCI hotplug: Use menuconfig objects
  PCI: ZT5550 CPCI Hotplug driver fix
  PCI: rpaphp: Remove semaphores
  PCI: rpaphp: Ensure more pcibios_add/pcibios_remove symmetry
  PCI: rpaphp: Use pcibios_remove_pci_devices() symmetrically
  PCI: rpaphp: Document is_php_dn()
  PCI: rpaphp: Document find_php_slot()
  PCI: rpaphp: Rename rpaphp_register_pci_slot() to rpaphp_enable_slot()
  PCI: rpaphp: refactor tail call to rpaphp_register_slot()
  PCI: rpaphp: remove rpaphp_set_attention_status()
  PCI: rpaphp: remove print_slot_pci_funcs()
  PCI: rpaphp: Remove setup_pci_slot()
  PCI: rpaphp: remove a call that does nothing but a pointer lookup
  PCI: rpaphp: Remove another wrappered function
  PCI: rpaphp: Remve another call that is a wrapper
  PCI: rpaphp: remove a function that does nothing but wrap debug printks
  PCI: rpaphp: Remove un-needed goto
  PCI: rpaphp: Fix a memleak; slot->location string was never freed
  ...
---

89661adaaee2f85116b399e642129ccd4dafd195
diff --cc drivers/i2c/busses/i2c-pca-isa.c
index 5f94e617fe,6b03e0d0a8..5161aaf934
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@@ -25,10 -25,8 +25,9 @@@
  #include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
- #include <linux/pci.h>
  #include <linux/wait.h>
  
 +#include <linux/isa.h>
  #include <linux/i2c.h>
  #include <linux/i2c-algo-pca.h>