diff --git a/[refs] b/[refs] index b8bf29620e5d..b5110f190404 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04b8b21d2ce8a33acd4b13f771b2fb85d952ff08 +refs/heads/master: 2ea4b442589b30210a166b9630c2547ebbe2cb82 diff --git a/trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/rc/Kconfig index 016f9ab1c1e9..4682a5a3c3ed 100644 --- a/trunk/drivers/media/rc/Kconfig +++ b/trunk/drivers/media/rc/Kconfig @@ -288,7 +288,7 @@ config IR_TTUSBIR be called ttusbir. config IR_RX51 - tristate "Nokia N900 IR transmitter diode + tristate "Nokia N900 IR transmitter diode" depends on MACH_NOKIA_RX51 && OMAP_DM_TIMER ---help--- Say Y or M here if you want to enable support for the IR