8 files changed, 16 insertions, 13 deletions

diff --git a/drivers/media/IR/ir-functions.c b/drivers/media/IR/ir-functions.c
index b501ac9d401d..ab06919ad5fc 100644
--- a/drivers/media/IR/ir-functions.c
+++ b/drivers/media/IR/ir-functions.c
@@ -52,7 +52,7 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
 /* -------------------------------------------------------------------------- */
 
 int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                  const enum ir_type ir_type)
+                  const u64 ir_type)
 {
         ir->ir_type = ir_type;
 
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c
index d73589ad55e6..d67c11d9921f 100644
--- a/drivers/media/IR/ir-sysfs.c
+++ b/drivers/media/IR/ir-sysfs.c
@@ -39,9 +39,9 @@ static ssize_t show_protocol(struct device *d,
 {
         char *s;
         struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        enum ir_type ir_type = ir_dev->rc_tab.ir_type;
+        u64 ir_type = ir_dev->rc_tab.ir_type;
 
-        IR_dprintk(1, "Current protocol is %ld\n", ir_type);
+        IR_dprintk(1, "Current protocol is %lld\n", (long long)ir_type);
 
         /* FIXME: doesn't support multiple protocols at the same time */
         if (ir_type == IR_TYPE_UNKNOWN)
@@ -77,7 +77,7 @@ static ssize_t store_protocol(struct device *d,
                               size_t len)
 {
         struct ir_input_dev *ir_dev = dev_get_drvdata(d);
-        enum ir_type ir_type = IR_TYPE_UNKNOWN;
+        u64 ir_type = IR_TYPE_UNKNOWN;
         int rc = -EINVAL;
         unsigned long flags;
         char *buf;
@@ -92,7 +92,8 @@ static ssize_t store_protocol(struct device *d,
                 ir_type = IR_TYPE_NEC;
 
         if (ir_type == IR_TYPE_UNKNOWN) {
-                IR_dprintk(1, "Error setting protocol to %ld\n", ir_type);
+                IR_dprintk(1, "Error setting protocol to %lld\n",
+                           (long long)ir_type);
                 return -EINVAL;
         }
 
@@ -101,7 +102,8 @@ static ssize_t store_protocol(struct device *d,
                                                     ir_type);
 
         if (rc < 0) {
-                IR_dprintk(1, "Error setting protocol to %ld\n", ir_type);
+                IR_dprintk(1, "Error setting protocol to %lld\n",
+                           (long long)ir_type);
                 return -EINVAL;
         }
 
@@ -109,7 +111,8 @@ static ssize_t store_protocol(struct device *d,
         ir_dev->rc_tab.ir_type = ir_type;
         spin_unlock_irqrestore(&ir_dev->rc_tab.lock, flags);
 
-        IR_dprintk(1, "Current protocol is %ld\n", ir_type);
+        IR_dprintk(1, "Current protocol is %lld\n",
+                   (long long)ir_type);
 
         return len;
 }
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 414d3b2444a2..aadf803c261c 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -578,7 +578,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
 {
         struct input_dev *input_dev;
         struct ir_scancode_table *ir_codes = &ir_codes_dm1105_nec_table;
-        enum ir_type ir_type = IR_TYPE_OTHER;
+        u64 ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
 
         input_dev = input_allocate_device();
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index f8053fd88346..b320dbd635aa 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -247,7 +247,7 @@ int bttv_input_init(struct bttv *btv)
         struct card_ir *ir;
         struct ir_scancode_table *ir_codes = NULL;
         struct input_dev *input_dev;
-        enum ir_type ir_type = IR_TYPE_OTHER;
+        u64 ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
 
         if (!btv->has_remote)
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 49c07535e754..de180d4d5a21 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -192,7 +192,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         struct cx88_IR *ir;
         struct input_dev *input_dev;
         struct ir_scancode_table *ir_codes = NULL;
-        enum ir_type ir_type = IR_TYPE_OTHER;
+        u64 ir_type = IR_TYPE_OTHER;
         int err = -ENOMEM;
 
         ir = kzalloc(sizeof(*ir), GFP_KERNEL);
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 674622372d4d..69dcf0cc1f1e 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -340,7 +340,7 @@ static void em28xx_ir_stop(struct em28xx_IR *ir)
         cancel_delayed_work_sync(&ir->work);
 }
 
-int em28xx_ir_change_protocol(void *priv, enum ir_type ir_type)
+int em28xx_ir_change_protocol(void *priv, u64 ir_type)
 {
         int rc = 0;
         struct em28xx_IR *ir = priv;
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 4cd75a3c47d1..094e21dbb14f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -299,7 +299,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         struct ir_scancode_table *ir_codes = NULL;
         const char *name = NULL;
-        enum ir_type ir_type = 0;
+        u64 ir_type = 0;
         struct IR_i2c *ir;
         struct input_dev *input_dev;
         struct i2c_adapter *adap = client->adapter;
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 71b4b01824ac..a4eaf1b75d70 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -460,7 +460,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
         int polling      = 0;
         int rc5_gpio     = 0;
         int nec_gpio     = 0;
-        enum ir_type ir_type = IR_TYPE_OTHER;
+        u64 ir_type = IR_TYPE_OTHER;
         int err;
 
         if (dev->has_remote != SAA7134_REMOTE_GPIO)