diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-24 18:01:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 18:01:29 -0500 |
| commit | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (patch) | |
| tree | 0789ba36d96dba330416a1e6a9a68e891a78802a /net/rfkill | |
| parent | 35700212b45ea9f98fa682cfc1bc1a67c9ccc34b (diff) | |
| parent | 18b6c9a2213d3b6e0212e8b225abf95f7564206a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index ba2efb960c60..09f4e161799b 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
| @@ -592,11 +592,13 @@ static const char *rfkill_get_type_str(enum rfkill_type type) | |||
| 592 | return "wwan"; | 592 | return "wwan"; |
| 593 | case RFKILL_TYPE_GPS: | 593 | case RFKILL_TYPE_GPS: |
| 594 | return "gps"; | 594 | return "gps"; |
| 595 | case RFKILL_TYPE_FM: | ||
| 596 | return "fm"; | ||
| 595 | default: | 597 | default: |
| 596 | BUG(); | 598 | BUG(); |
| 597 | } | 599 | } |
| 598 | 600 | ||
| 599 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_GPS + 1); | 601 | BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); |
| 600 | } | 602 | } |
| 601 | 603 | ||
| 602 | static ssize_t rfkill_type_show(struct device *dev, | 604 | static ssize_t rfkill_type_show(struct device *dev, |