diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atm/Makefile | 2 | ||||
-rw-r--r-- | drivers/input/misc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 2 | ||||
-rw-r--r-- | drivers/telephony/Kconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile index 1b16f8166b09..e4fa99658699 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile | |||
@@ -41,7 +41,7 @@ ifeq ($(CONFIG_ATM_FORE200E_PCA),y) | |||
41 | # guess the target endianess to choose the right PCA-200E firmware image | 41 | # guess the target endianess to choose the right PCA-200E firmware image |
42 | ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y) | 42 | ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y) |
43 | byteorder.h := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h | 43 | byteorder.h := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h |
44 | CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) $(CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) | 44 | CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) $(KBUILD_CPPFLAGS) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) |
45 | endif | 45 | endif |
46 | endif | 46 | endif |
47 | 47 | ||
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index d602b8fa7d46..7acc6351bb44 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
@@ -152,7 +152,7 @@ config INPUT_POWERMATE | |||
152 | 152 | ||
153 | config INPUT_YEALINK | 153 | config INPUT_YEALINK |
154 | tristate "Yealink usb-p1k voip phone" | 154 | tristate "Yealink usb-p1k voip phone" |
155 | depends EXPERIMENTAL | 155 | depends on EXPERIMENTAL |
156 | depends on USB_ARCH_HAS_HCD | 156 | depends on USB_ARCH_HAS_HCD |
157 | select USB | 157 | select USB |
158 | help | 158 | help |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 257b44094e4c..ec568fa1c6cc 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -83,7 +83,7 @@ config LEDS_WRAP | |||
83 | 83 | ||
84 | config LEDS_H1940 | 84 | config LEDS_H1940 |
85 | tristate "LED Support for iPAQ H1940 device" | 85 | tristate "LED Support for iPAQ H1940 device" |
86 | depends LEDS_CLASS && ARCH_H1940 | 86 | depends on LEDS_CLASS && ARCH_H1940 |
87 | help | 87 | help |
88 | This option enables support for the LEDs on the h1940. | 88 | This option enables support for the LEDs on the h1940. |
89 | 89 | ||
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig index 5f98f673f1b6..b5f78b6ed2bd 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/telephony/Kconfig | |||
@@ -19,7 +19,7 @@ if PHONE | |||
19 | 19 | ||
20 | config PHONE_IXJ | 20 | config PHONE_IXJ |
21 | tristate "QuickNet Internet LineJack/PhoneJack support" | 21 | tristate "QuickNet Internet LineJack/PhoneJack support" |
22 | depends ISA || PCI | 22 | depends on ISA || PCI |
23 | ---help--- | 23 | ---help--- |
24 | Say M if you have a telephony card manufactured by Quicknet | 24 | Say M if you have a telephony card manufactured by Quicknet |
25 | Technologies, Inc. These include the Internet PhoneJACK and | 25 | Technologies, Inc. These include the Internet PhoneJACK and |