diff --git a/[refs] b/[refs]
index d41e62ffc8a3..2aa6e2e89bae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87e9429490dfe610faaf209795942272bc7a730a
+refs/heads/master: 500c3201e2aed201f2de0468dfeb3ceb98a9f981
diff --git a/trunk/drivers/media/rc/gpio-ir-recv.c b/trunk/drivers/media/rc/gpio-ir-recv.c
index 59fe60cd1e02..04cb272db16a 100644
--- a/trunk/drivers/media/rc/gpio-ir-recv.c
+++ b/trunk/drivers/media/rc/gpio-ir-recv.c
@@ -84,7 +84,6 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
 
 	rcdev->priv = gpio_dev;
 	rcdev->driver_type = RC_DRIVER_IR_RAW;
-	rcdev->allowed_protos = RC_TYPE_ALL;
 	rcdev->input_name = GPIO_IR_DEVICE_NAME;
 	rcdev->input_phys = GPIO_IR_DEVICE_NAME "/input0";
 	rcdev->input_id.bustype = BUS_HOST;
@@ -93,6 +92,10 @@ static int __devinit gpio_ir_recv_probe(struct platform_device *pdev)
 	rcdev->input_id.version = 0x0100;
 	rcdev->dev.parent = &pdev->dev;
 	rcdev->driver_name = GPIO_IR_DRIVER_NAME;
+	if (pdata->allowed_protos)
+		rcdev->allowed_protos = pdata->allowed_protos;
+	else
+		rcdev->allowed_protos = RC_TYPE_ALL;
 	rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
 
 	gpio_dev->rcdev = rcdev;
diff --git a/trunk/include/media/gpio-ir-recv.h b/trunk/include/media/gpio-ir-recv.h
index 91546f35b7e1..0142736a59db 100644
--- a/trunk/include/media/gpio-ir-recv.h
+++ b/trunk/include/media/gpio-ir-recv.h
@@ -14,9 +14,10 @@
 #define __GPIO_IR_RECV_H__
 
 struct gpio_ir_recv_platform_data {
-	int gpio_nr;
-	bool active_low;
-	const char *map_name;
+	int		gpio_nr;
+	bool		active_low;
+	u64		allowed_protos;
+	const char	*map_name;
 };
 
 #endif /* __GPIO_IR_RECV_H__ */