netfilter: nf_conntrack: support conntrack templates

[safe/jmp/linux-2.6] / include / linux / i2c-id.h

diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index ee9fbc1..e844a0b 100644 (file)
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -28,17 +28,6 @@
    identify a legacy client. If you don't need them, just don't set them. */
 
 /*
- * ---- Driver types -----------------------------------------------------
- */
-
-#define I2C_DRIVERID_MSP3400    1
-#define I2C_DRIVERID_TUNER      2
-#define I2C_DRIVERID_TDA7432   27      /* Stereo sound processor       */
-#define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_SAA711X   73      /* saa711x video encoders       */
-#define I2C_DRIVERID_INFRARED  75      /* I2C InfraRed on Video boards */
-
-/*
  * ---- Adapter types ----------------------------------------------------
  */
 
@@ -51,6 +40,7 @@
 #define I2C_HW_B_CX2341X       0x010020 /* Conexant CX2341X MPEG encoder cards */
 #define I2C_HW_B_CX23885       0x010022 /* conexant 23885 based tv cards (bus1) */
 #define I2C_HW_B_AU0828                0x010023 /* auvitek au0828 usb bridge */
+#define I2C_HW_B_CX231XX       0x010024 /* Conexant CX231XX USB based cards */
 #define I2C_HW_B_HDPVR         0x010025 /* Hauppauge HD PVR */
 
 /* --- SGI adapters                                                    */