From 3d9ad82e01b03f6eec431e45c3ad711d94c55d89 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Sun, 18 Dec 2011 11:30:22 +0300 Subject: [PATCH 09/12] rfkill: add IR type Infrared receivers/transmitters can also be disabled, so add IR type to rfkill subsystem Signed-off-by: Vasily Khoruzhick --- include/linux/rfkill.h | 1 + net/rfkill/core.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h index c6c6084..f7b30c6 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h @@ -48,6 +48,7 @@ enum rfkill_type { RFKILL_TYPE_WWAN, RFKILL_TYPE_GPS, RFKILL_TYPE_FM, + RFKILL_TYPE_IR, NUM_RFKILL_TYPES, }; diff --git a/net/rfkill/core.c b/net/rfkill/core.c index be90640..e13f756 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -566,7 +566,7 @@ static ssize_t rfkill_name_show(struct device *dev, static const char *rfkill_get_type_str(enum rfkill_type type) { - BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); + BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_IR + 1); switch (type) { case RFKILL_TYPE_WLAN: @@ -583,6 +583,8 @@ static const char *rfkill_get_type_str(enum rfkill_type type) return "gps"; case RFKILL_TYPE_FM: return "fm"; + case RFKILL_TYPE_IR: + return "ir"; default: BUG(); } -- 1.7.8