diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-03-25 04:27:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-25 07:21:20 -0400 |
commit | c535cc6c714bd21b3afad35baa926b3b9eb51361 (patch) | |
tree | bb572f48aa54b184dd0e712b111bbbbb2e72abdf | |
parent | 8dbee53b2a8dcc23e8d52d85d7e0b4fe268c55e7 (diff) |
[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>
-rw-r--r-- | drivers/staging/media/lirc/lirc_sir.c | 10 |
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 63a554c36f75..f781c532b3c4 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) | |||
787 | spin_lock_irqsave(&hardware_lock, flags); | 787 | spin_lock_irqsave(&hardware_lock, flags); |
788 | /* reset UART */ | 788 | /* reset UART */ |
789 | #ifdef LIRC_ON_SA1100 | 789 | #ifdef LIRC_ON_SA1100 |
790 | #ifdef CONFIG_SA1100_BITSY | ||
791 | if (machine_is_bitsy()) { | ||
792 | pr_info("Power on IR module\n"); | ||
793 | set_bitsy_egpio(EGPIO_BITSY_IR_ON); | ||
794 | } | ||
795 | #endif | ||
796 | #ifdef CONFIG_SA1100_COLLIE | 790 | #ifdef CONFIG_SA1100_COLLIE |
797 | sa1100_irda_set_power_collie(3); /* power on */ | 791 | sa1100_irda_set_power_collie(3); /* power on */ |
798 | #endif | 792 | #endif |
@@ -942,10 +936,6 @@ static void drop_hardware(void) | |||
942 | Ser2UTCR3 = sr.utcr3; | 936 | Ser2UTCR3 = sr.utcr3; |
943 | 937 | ||
944 | Ser2HSCR0 = sr.hscr0; | 938 | Ser2HSCR0 = sr.hscr0; |
945 | #ifdef CONFIG_SA1100_BITSY | ||
946 | if (machine_is_bitsy()) | ||
947 | clr_bitsy_egpio(EGPIO_BITSY_IR_ON); | ||
948 | #endif | ||
949 | #ifdef CONFIG_SA1100_COLLIE | 939 | #ifdef CONFIG_SA1100_COLLIE |
950 | sa1100_irda_set_power_collie(0); /* power off */ | 940 | sa1100_irda_set_power_collie(0); /* power off */ |
951 | #endif | 941 | #endif |