aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/media
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-03-25 05:27:12 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-25 08:21:20 -0300
commitc535cc6c714bd21b3afad35baa926b3b9eb51361 (patch)
treebb572f48aa54b184dd0e712b111bbbbb2e72abdf /drivers/staging/media
parent8dbee53b2a8dcc23e8d52d85d7e0b4fe268c55e7 (diff)
downloadvexpress-lsk-c535cc6c714bd21b3afad35baa926b3b9eb51361.tar.gz
[media] staging: lirc_sir: remove dead code
lirc_sir uses the CONFIG_SA1100_BITSY Kconfig macro. But its Kconfig symbol was removed in v2.4.13. So remove dead code associated with it. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
-rw-r--r--drivers/staging/media/lirc/lirc_sir.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 63a554c36f7..f781c532b3c 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -787,12 +787,6 @@ static int init_hardware(void)
spin_lock_irqsave(&hardware_lock, flags);
/* reset UART */
#ifdef LIRC_ON_SA1100
-#ifdef CONFIG_SA1100_BITSY
- if (machine_is_bitsy()) {
- pr_info("Power on IR module\n");
- set_bitsy_egpio(EGPIO_BITSY_IR_ON);
- }
-#endif
#ifdef CONFIG_SA1100_COLLIE
sa1100_irda_set_power_collie(3); /* power on */
#endif
@@ -942,10 +936,6 @@ static void drop_hardware(void)
Ser2UTCR3 = sr.utcr3;
Ser2HSCR0 = sr.hscr0;
-#ifdef CONFIG_SA1100_BITSY
- if (machine_is_bitsy())
- clr_bitsy_egpio(EGPIO_BITSY_IR_ON);
-#endif
#ifdef CONFIG_SA1100_COLLIE
sa1100_irda_set_power_collie(0); /* power off */
#endif