diff --git a/[refs] b/[refs]
index 36e0b8b52efa..ae7df3d82532 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b296fc6017e0ec6bc6cd0f40275f268035eb6b8b
+refs/heads/master: 22ae2550f65bc322e6bdeff9d3948bbb5e0a9b67
diff --git a/trunk/include/media/id.h b/trunk/include/media/id.h
deleted file mode 100644
index 4f58d73e7029..000000000000
--- a/trunk/include/media/id.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- */
-
-/* FIXME: this temporarely, until these are included in linux/i2c-id.h */
-
-/* drivers */
-#ifndef  I2C_DRIVERID_TVMIXER
-# define I2C_DRIVERID_TVMIXER I2C_DRIVERID_EXP0
-#endif
-#ifndef  I2C_DRIVERID_TVAUDIO
-# define I2C_DRIVERID_TVAUDIO I2C_DRIVERID_EXP1
-#endif
-
-/* chips */
-#ifndef  I2C_DRIVERID_DPL3518
-# define I2C_DRIVERID_DPL3518 I2C_DRIVERID_EXP2
-#endif
-#ifndef  I2C_DRIVERID_TDA9873
-# define I2C_DRIVERID_TDA9873 I2C_DRIVERID_EXP3
-#endif
-#ifndef  I2C_DRIVERID_TDA9875
-# define I2C_DRIVERID_TDA9875 I2C_DRIVERID_EXP0+4
-#endif
-#ifndef  I2C_DRIVERID_PIC16C54_PV951
-# define I2C_DRIVERID_PIC16C54_PV951 I2C_DRIVERID_EXP0+5
-#endif
-#ifndef  I2C_DRIVERID_TDA7432
-# define I2C_DRIVERID_TDA7432 I2C_DRIVERID_EXP0+6
-#endif
-#ifndef  I2C_DRIVERID_TDA9874
-# define I2C_DRIVERID_TDA9874 I2C_DRIVERID_EXP0+7
-#endif
-#ifndef  I2C_DRIVERID_SAA6752HS
-# define I2C_DRIVERID_SAA6752HS I2C_DRIVERID_EXP0+8
-#endif
-#ifndef  I2C_DRIVERID_WM8775
-#define  I2C_DRIVERID_WM8775 I2C_DRIVERID_EXP0+9
-#endif
-#ifndef  I2C_DRIVERID_CS53L32A
-#define  I2C_DRIVERID_CS53L32A I2C_DRIVERID_EXP0+10
-#endif
-#ifndef  I2C_DRIVERID_CX25840
-#define  I2C_DRIVERID_CX25840 I2C_DRIVERID_EXP0+11
-#endif
-#ifndef  I2C_DRIVERID_SAA7115
-#define  I2C_DRIVERID_SAA7115 I2C_DRIVERID_EXP0+12
-#endif
-#ifndef  I2C_DRIVERID_SAA7127
-#define  I2C_DRIVERID_SAA7127 I2C_DRIVERID_EXP0+13
-#endif