diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/leds/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/hamradio/dmascc.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 8 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/Kconfig | 15 |
5 files changed, 17 insertions, 12 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index a3a6199639f9..eb97c4113d78 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -1,6 +1,5 @@ | |||
1 | menuconfig NEW_LEDS | 1 | menuconfig NEW_LEDS |
2 | bool "LED Support" | 2 | bool "LED Support" |
3 | depends on HAS_IOMEM | ||
4 | help | 3 | help |
5 | Say Y to enable Linux LED support. This allows control of supported | 4 | Say Y to enable Linux LED support. This allows control of supported |
6 | LEDs from both userspace and optionally, by kernel events (triggers). | 5 | LEDs from both userspace and optionally, by kernel events (triggers). |
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index e04bf9926441..0b94833e23f7 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
@@ -1083,15 +1083,12 @@ static void start_timer(struct scc_priv *priv, int t, int r15) | |||
1083 | if (t == 0) { | 1083 | if (t == 0) { |
1084 | tm_isr(priv); | 1084 | tm_isr(priv); |
1085 | } else if (t > 0) { | 1085 | } else if (t > 0) { |
1086 | save_flags(flags); | ||
1087 | cli(); | ||
1088 | outb(t & 0xFF, priv->tmr_cnt); | 1086 | outb(t & 0xFF, priv->tmr_cnt); |
1089 | outb((t >> 8) & 0xFF, priv->tmr_cnt); | 1087 | outb((t >> 8) & 0xFF, priv->tmr_cnt); |
1090 | if (priv->type != TYPE_TWIN) { | 1088 | if (priv->type != TYPE_TWIN) { |
1091 | write_scc(priv, R15, r15 | CTSIE); | 1089 | write_scc(priv, R15, r15 | CTSIE); |
1092 | priv->rr0 |= CTS; | 1090 | priv->rr0 |= CTS; |
1093 | } | 1091 | } |
1094 | restore_flags(flags); | ||
1095 | } | 1092 | } |
1096 | } | 1093 | } |
1097 | 1094 | ||
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index f844b738d34e..c4e631d14bfe 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -49,7 +49,9 @@ config IWL4965_HT | |||
49 | 49 | ||
50 | config IWL4965_LEDS | 50 | config IWL4965_LEDS |
51 | bool "Enable LEDS features in iwl4965 driver" | 51 | bool "Enable LEDS features in iwl4965 driver" |
52 | depends on IWL4965 && MAC80211_LEDS && LEDS_CLASS | 52 | depends on IWL4965 |
53 | select MAC80211_LEDS | ||
54 | select LEDS_CLASS | ||
53 | select IWLWIFI_LEDS | 55 | select IWLWIFI_LEDS |
54 | ---help--- | 56 | ---help--- |
55 | This option enables LEDS for the iwlwifi drivers | 57 | This option enables LEDS for the iwlwifi drivers |
@@ -134,7 +136,9 @@ config IWL3945_SPECTRUM_MEASUREMENT | |||
134 | 136 | ||
135 | config IWL3945_LEDS | 137 | config IWL3945_LEDS |
136 | bool "Enable LEDS features in iwl3945 driver" | 138 | bool "Enable LEDS features in iwl3945 driver" |
137 | depends on IWL3945 && MAC80211_LEDS && LEDS_CLASS | 139 | depends on IWL3945 |
140 | select MAC80211_LEDS | ||
141 | select LEDS_CLASS | ||
138 | ---help--- | 142 | ---help--- |
139 | This option enables LEDS for the iwl3945 driver. | 143 | This option enables LEDS for the iwl3945 driver. |
140 | 144 | ||
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile index 4f3e88b12e3a..ec6187b75c3b 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | obj-$(CONFIG_IWLCORE) := iwlcore.o | 1 | obj-$(CONFIG_IWLCORE) += iwlcore.o |
2 | iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o | 2 | iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o |
3 | iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o | 3 | iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o |
4 | iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o | 4 | iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o |
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig index a1e3938cba9b..ab1029e79884 100644 --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig | |||
@@ -60,7 +60,8 @@ config RT2400PCI_RFKILL | |||
60 | 60 | ||
61 | config RT2400PCI_LEDS | 61 | config RT2400PCI_LEDS |
62 | bool "RT2400 leds support" | 62 | bool "RT2400 leds support" |
63 | depends on RT2400PCI && LEDS_CLASS | 63 | depends on RT2400PCI |
64 | select LEDS_CLASS | ||
64 | select RT2X00_LIB_LEDS | 65 | select RT2X00_LIB_LEDS |
65 | ---help--- | 66 | ---help--- |
66 | This adds support for led triggers provided my mac80211. | 67 | This adds support for led triggers provided my mac80211. |
@@ -86,7 +87,8 @@ config RT2500PCI_RFKILL | |||
86 | 87 | ||
87 | config RT2500PCI_LEDS | 88 | config RT2500PCI_LEDS |
88 | bool "RT2500 leds support" | 89 | bool "RT2500 leds support" |
89 | depends on RT2500PCI && LEDS_CLASS | 90 | depends on RT2500PCI |
91 | select LEDS_CLASS | ||
90 | select RT2X00_LIB_LEDS | 92 | select RT2X00_LIB_LEDS |
91 | ---help--- | 93 | ---help--- |
92 | This adds support for led triggers provided my mac80211. | 94 | This adds support for led triggers provided my mac80211. |
@@ -114,7 +116,8 @@ config RT61PCI_RFKILL | |||
114 | 116 | ||
115 | config RT61PCI_LEDS | 117 | config RT61PCI_LEDS |
116 | bool "RT61 leds support" | 118 | bool "RT61 leds support" |
117 | depends on RT61PCI && LEDS_CLASS | 119 | depends on RT61PCI |
120 | select LEDS_CLASS | ||
118 | select RT2X00_LIB_LEDS | 121 | select RT2X00_LIB_LEDS |
119 | ---help--- | 122 | ---help--- |
120 | This adds support for led triggers provided my mac80211. | 123 | This adds support for led triggers provided my mac80211. |
@@ -130,7 +133,8 @@ config RT2500USB | |||
130 | 133 | ||
131 | config RT2500USB_LEDS | 134 | config RT2500USB_LEDS |
132 | bool "RT2500 leds support" | 135 | bool "RT2500 leds support" |
133 | depends on RT2500USB && LEDS_CLASS | 136 | depends on RT2500USB |
137 | select LEDS_CLASS | ||
134 | select RT2X00_LIB_LEDS | 138 | select RT2X00_LIB_LEDS |
135 | ---help--- | 139 | ---help--- |
136 | This adds support for led triggers provided my mac80211. | 140 | This adds support for led triggers provided my mac80211. |
@@ -148,7 +152,8 @@ config RT73USB | |||
148 | 152 | ||
149 | config RT73USB_LEDS | 153 | config RT73USB_LEDS |
150 | bool "RT73 leds support" | 154 | bool "RT73 leds support" |
151 | depends on RT73USB && LEDS_CLASS | 155 | depends on RT73USB |
156 | select LEDS_CLASS | ||
152 | select RT2X00_LIB_LEDS | 157 | select RT2X00_LIB_LEDS |
153 | ---help--- | 158 | ---help--- |
154 | This adds support for led triggers provided my mac80211. | 159 | This adds support for led triggers provided my mac80211. |