Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[safe/jmp/linux-2.6] / include / media / rc-map.h

diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 280d1ed..5833966 100644 (file)
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -13,11 +13,10 @@
 
 #define IR_TYPE_UNKNOWN        0
 #define IR_TYPE_RC5    (1  << 0)       /* Philips RC5 protocol */
-#define IR_TYPE_PD     (1  << 1)       /* Pulse distance encoded IR */
-#define IR_TYPE_NEC    (1  << 2)
-#define IR_TYPE_RC6    (1  << 3)       /* Philips RC6 protocol */
-#define IR_TYPE_JVC    (1  << 4)       /* JVC protocol */
-#define IR_TYPE_SONY   (1  << 5)       /* Sony12/15/20 protocol */
+#define IR_TYPE_NEC    (1  << 1)
+#define IR_TYPE_RC6    (1  << 2)       /* Philips RC6 protocol */
+#define IR_TYPE_JVC    (1  << 3)       /* JVC protocol */
+#define IR_TYPE_SONY   (1  << 4)       /* Sony12/15/20 protocol */
 #define IR_TYPE_OTHER  (1u << 31)
 
 struct ir_scancode {