Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Stop using i2c_adapter.class_dev
  i2c: Remove the warning on missing adapter device
  i2c: Declare more i2c_adapter parent devices
  i2c: PA Semi SMBus driver
  i2c-amd8111: Proposed cleanups
  i2c-parport: Add support for One For All remote JP1 interface
  i2c-viapro: Add support for the VIA CX700 south bridge
  i2c: Add IDs to adapters
  i2c: Update the list of bus IDs
  i2c: Add driver suspend/resume/shutdown support
  i2c: completion header cleanups
  i2c-i801: Document the SMBus unhiding quirk
  i2c-i801: Spelling fix
  i2c: Fix typo in SMBus Write Word Data description
  i2c-piix4: Add support for the ATI SB600
  i2c-nforce2: Drop unused reference to pci_dev
  i2c/vt8231: Remove superfluous initialization
  i2c-ali1563: Fix device initialization
  i2c-ali1563: Improve the status messages

3 files changed, 8 insertions, 5 deletions

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 6e7ec4c76178..9c21dc793d7b 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -232,7 +232,6 @@
 #define I2C_HW_SMBUS_PIIX4      0x040000
 #define I2C_HW_SMBUS_ALI15X3    0x040001
 #define I2C_HW_SMBUS_VIA2       0x040002
-#define I2C_HW_SMBUS_VOODOO3    0x040003
 #define I2C_HW_SMBUS_I801       0x040004
 #define I2C_HW_SMBUS_AMD756     0x040005
 #define I2C_HW_SMBUS_SIS5595    0x040006
@@ -248,13 +247,11 @@
 #define I2C_HW_SMBUS_OV519      0x040010 /* OV519 USB 1.1 webcam IC */
 #define I2C_HW_SMBUS_OVFX2      0x040011 /* Cypress/OmniVision FX2 webcam */
 #define I2C_HW_SMBUS_CAFE       0x040012 /* Marvell 88ALP01 "CAFE" cam  */
+#define I2C_HW_SMBUS_ALI1563    0x040013
 
 /* --- ISA pseudo-adapter                                               */
 #define I2C_HW_ISA              0x050000
 
-/* --- IPMI pseudo-adapter                                              */
-#define I2C_HW_IPMI             0x0b0000
-
 /* --- IPMB adapter                                             */
 #define I2C_HW_IPMB             0x0c0000
 
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 71e50d3e492f..9428092017e3 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -125,7 +125,12 @@ struct i2c_driver {
          * it must be freed here.
          */
         int (*detach_client)(struct i2c_client *);
-        
+
+        /* driver model interfaces that don't relate to enumeration  */
+        void (*shutdown)(struct i2c_client *);
+        int (*suspend)(struct i2c_client *, pm_message_t mesg);
+        int (*resume)(struct i2c_client *);
+
         /* a ioctl like command that can be used to perform specific functions
          * with the device.
          */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 8fb9c3e06eef..182a96f77c84 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -369,6 +369,7 @@
 #define PCI_DEVICE_ID_ATI_IXP400_SATA2  0x437a
 #define PCI_DEVICE_ID_ATI_IXP600_SATA   0x4380
 #define PCI_DEVICE_ID_ATI_IXP600_SRAID  0x4381
+#define PCI_DEVICE_ID_ATI_IXP600_SMBUS  0x4385
 #define PCI_DEVICE_ID_ATI_IXP600_IDE    0x438c
 
 #define PCI_VENDOR_ID_VLSI              0x1004