Title: [6671] trunk/include/linux/i2c-id.h: move ADV7170 to a diff line to keep merge conflicts down
- Revision
- 6671
- Author
- vapier
- Date
- 2009-06-11 20:39:13 -0500 (Thu, 11 Jun 2009)
Log Message
move ADV7170 to a diff line to keep merge conflicts down
Modified Paths
Diff
Modified: trunk/include/linux/i2c-id.h (6670 => 6671)
--- trunk/include/linux/i2c-id.h 2009-06-12 01:35:46 UTC (rev 6670)
+++ trunk/include/linux/i2c-id.h 2009-06-12 01:39:13 UTC (rev 6671)
@@ -35,9 +35,9 @@
#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_ADV7170 54 /* video encoder */
#define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */
#define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */
-#define I2C_DRIVERID_ADV7170 54 /* video encoder */
#define I2C_DRIVERID_AD5252 1049
/*
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
