diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/Kconfig | 2 | ||||
-rw-r--r-- | drivers/ide/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 22 | ||||
-rw-r--r-- | drivers/media/video/ov7670.c | 2 | ||||
-rw-r--r-- | drivers/net/e100.c | 3 | ||||
-rw-r--r-- | drivers/serial/Kconfig | 4 | ||||
-rw-r--r-- | drivers/serial/icom.c | 2 |
7 files changed, 18 insertions, 19 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index b10f4d8fdc7f..0a3aee29e067 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -867,7 +867,7 @@ config SONYPI | |||
867 | 867 | ||
868 | config TANBAC_TB0219 | 868 | config TANBAC_TB0219 |
869 | tristate "TANBAC TB0219 base board support" | 869 | tristate "TANBAC TB0219 base board support" |
870 | depends TANBAC_TB022X | 870 | depends on TANBAC_TB022X |
871 | select GPIO_VR41XX | 871 | select GPIO_VR41XX |
872 | 872 | ||
873 | source "drivers/char/agp/Kconfig" | 873 | source "drivers/char/agp/Kconfig" |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index e23bc0d62159..3f828052f8d2 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -796,7 +796,7 @@ endchoice | |||
796 | config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ | 796 | config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ |
797 | int "Maximum transfer size (KB) per request (up to 128)" | 797 | int "Maximum transfer size (KB) per request (up to 128)" |
798 | default "128" | 798 | default "128" |
799 | depends BLK_DEV_IDE_AU1XXX | 799 | depends on BLK_DEV_IDE_AU1XXX |
800 | 800 | ||
801 | config IDE_ARM | 801 | config IDE_ARM |
802 | def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) | 802 | def_bool ARM && (ARCH_A5K || ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 176142c61492..7399ba791116 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -12,7 +12,7 @@ config NEW_LEDS | |||
12 | 12 | ||
13 | config LEDS_CLASS | 13 | config LEDS_CLASS |
14 | tristate "LED Class Support" | 14 | tristate "LED Class Support" |
15 | depends NEW_LEDS | 15 | depends on NEW_LEDS |
16 | help | 16 | help |
17 | This option enables the led sysfs class in /sys/class/leds. You'll | 17 | This option enables the led sysfs class in /sys/class/leds. You'll |
18 | need this to do anything useful with LEDs. If unsure, say N. | 18 | need this to do anything useful with LEDs. If unsure, say N. |
@@ -21,28 +21,28 @@ comment "LED drivers" | |||
21 | 21 | ||
22 | config LEDS_CORGI | 22 | config LEDS_CORGI |
23 | tristate "LED Support for the Sharp SL-C7x0 series" | 23 | tristate "LED Support for the Sharp SL-C7x0 series" |
24 | depends LEDS_CLASS && PXA_SHARP_C7xx | 24 | depends on LEDS_CLASS && PXA_SHARP_C7xx |
25 | help | 25 | help |
26 | This option enables support for the LEDs on Sharp Zaurus | 26 | This option enables support for the LEDs on Sharp Zaurus |
27 | SL-C7x0 series (C700, C750, C760, C860). | 27 | SL-C7x0 series (C700, C750, C760, C860). |
28 | 28 | ||
29 | config LEDS_LOCOMO | 29 | config LEDS_LOCOMO |
30 | tristate "LED Support for Locomo device" | 30 | tristate "LED Support for Locomo device" |
31 | depends LEDS_CLASS && SHARP_LOCOMO | 31 | depends on LEDS_CLASS && SHARP_LOCOMO |
32 | help | 32 | help |
33 | This option enables support for the LEDs on Sharp Locomo. | 33 | This option enables support for the LEDs on Sharp Locomo. |
34 | Zaurus models SL-5500 and SL-5600. | 34 | Zaurus models SL-5500 and SL-5600. |
35 | 35 | ||
36 | config LEDS_SPITZ | 36 | config LEDS_SPITZ |
37 | tristate "LED Support for the Sharp SL-Cxx00 series" | 37 | tristate "LED Support for the Sharp SL-Cxx00 series" |
38 | depends LEDS_CLASS && PXA_SHARP_Cxx00 | 38 | depends on LEDS_CLASS && PXA_SHARP_Cxx00 |
39 | help | 39 | help |
40 | This option enables support for the LEDs on Sharp Zaurus | 40 | This option enables support for the LEDs on Sharp Zaurus |
41 | SL-Cxx00 series (C1000, C3000, C3100). | 41 | SL-Cxx00 series (C1000, C3000, C3100). |
42 | 42 | ||
43 | config LEDS_IXP4XX | 43 | config LEDS_IXP4XX |
44 | tristate "LED Support for GPIO connected LEDs on IXP4XX processors" | 44 | tristate "LED Support for GPIO connected LEDs on IXP4XX processors" |
45 | depends LEDS_CLASS && ARCH_IXP4XX | 45 | depends on LEDS_CLASS && ARCH_IXP4XX |
46 | help | 46 | help |
47 | This option enables support for the LEDs connected to GPIO | 47 | This option enables support for the LEDs connected to GPIO |
48 | outputs of the Intel IXP4XX processors. To be useful the | 48 | outputs of the Intel IXP4XX processors. To be useful the |
@@ -51,7 +51,7 @@ config LEDS_IXP4XX | |||
51 | 51 | ||
52 | config LEDS_TOSA | 52 | config LEDS_TOSA |
53 | tristate "LED Support for the Sharp SL-6000 series" | 53 | tristate "LED Support for the Sharp SL-6000 series" |
54 | depends LEDS_CLASS && PXA_SHARPSL | 54 | depends on LEDS_CLASS && PXA_SHARPSL |
55 | help | 55 | help |
56 | This option enables support for the LEDs on Sharp Zaurus | 56 | This option enables support for the LEDs on Sharp Zaurus |
57 | SL-6000 series. | 57 | SL-6000 series. |
@@ -65,7 +65,7 @@ config LEDS_S3C24XX | |||
65 | 65 | ||
66 | config LEDS_AMS_DELTA | 66 | config LEDS_AMS_DELTA |
67 | tristate "LED Support for the Amstrad Delta (E3)" | 67 | tristate "LED Support for the Amstrad Delta (E3)" |
68 | depends LEDS_CLASS && MACH_AMS_DELTA | 68 | depends on LEDS_CLASS && MACH_AMS_DELTA |
69 | help | 69 | help |
70 | This option enables support for the LEDs on Amstrad Delta (E3). | 70 | This option enables support for the LEDs on Amstrad Delta (E3). |
71 | 71 | ||
@@ -86,7 +86,7 @@ comment "LED Triggers" | |||
86 | 86 | ||
87 | config LEDS_TRIGGERS | 87 | config LEDS_TRIGGERS |
88 | bool "LED Trigger support" | 88 | bool "LED Trigger support" |
89 | depends NEW_LEDS | 89 | depends on NEW_LEDS |
90 | help | 90 | help |
91 | This option enables trigger support for the leds class. | 91 | This option enables trigger support for the leds class. |
92 | These triggers allow kernel events to drive the LEDs and can | 92 | These triggers allow kernel events to drive the LEDs and can |
@@ -94,21 +94,21 @@ config LEDS_TRIGGERS | |||
94 | 94 | ||
95 | config LEDS_TRIGGER_TIMER | 95 | config LEDS_TRIGGER_TIMER |
96 | tristate "LED Timer Trigger" | 96 | tristate "LED Timer Trigger" |
97 | depends LEDS_TRIGGERS | 97 | depends on LEDS_TRIGGERS |
98 | help | 98 | help |
99 | This allows LEDs to be controlled by a programmable timer | 99 | This allows LEDs to be controlled by a programmable timer |
100 | via sysfs. If unsure, say Y. | 100 | via sysfs. If unsure, say Y. |
101 | 101 | ||
102 | config LEDS_TRIGGER_IDE_DISK | 102 | config LEDS_TRIGGER_IDE_DISK |
103 | bool "LED IDE Disk Trigger" | 103 | bool "LED IDE Disk Trigger" |
104 | depends LEDS_TRIGGERS && BLK_DEV_IDEDISK | 104 | depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK |
105 | help | 105 | help |
106 | This allows LEDs to be controlled by IDE disk activity. | 106 | This allows LEDs to be controlled by IDE disk activity. |
107 | If unsure, say Y. | 107 | If unsure, say Y. |
108 | 108 | ||
109 | config LEDS_TRIGGER_HEARTBEAT | 109 | config LEDS_TRIGGER_HEARTBEAT |
110 | tristate "LED Heartbeat Trigger" | 110 | tristate "LED Heartbeat Trigger" |
111 | depends LEDS_TRIGGERS | 111 | depends on LEDS_TRIGGERS |
112 | help | 112 | help |
113 | This allows LEDs to be controlled by a CPU load average. | 113 | This allows LEDs to be controlled by a CPU load average. |
114 | The flash frequency is a hyperbolic function of the 1-minute | 114 | The flash frequency is a hyperbolic function of the 1-minute |
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 89dd18c3c5cc..5ed0adc4ca26 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
19 | 19 | ||
20 | 20 | ||
21 | MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net."); | 21 | MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); |
22 | MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors"); | 22 | MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors"); |
23 | MODULE_LICENSE("GPL"); | 23 | MODULE_LICENSE("GPL"); |
24 | 24 | ||
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 03bf164f9e8d..c2ae2a24629b 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1930,9 +1930,8 @@ static int e100_rx_alloc_list(struct nic *nic) | |||
1930 | nic->rx_to_use = nic->rx_to_clean = NULL; | 1930 | nic->rx_to_use = nic->rx_to_clean = NULL; |
1931 | nic->ru_running = RU_UNINITIALIZED; | 1931 | nic->ru_running = RU_UNINITIALIZED; |
1932 | 1932 | ||
1933 | if(!(nic->rxs = kmalloc(sizeof(struct rx) * count, GFP_ATOMIC))) | 1933 | if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC))) |
1934 | return -ENOMEM; | 1934 | return -ENOMEM; |
1935 | memset(nic->rxs, 0, sizeof(struct rx) * count); | ||
1936 | 1935 | ||
1937 | for(rx = nic->rxs, i = 0; i < count; rx++, i++) { | 1936 | for(rx = nic->rxs, i = 0; i < count; rx++, i++) { |
1938 | rx->next = (i + 1 < count) ? rx + 1 : nic->rxs; | 1937 | rx->next = (i + 1 < count) ? rx + 1 : nic->rxs; |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 0b36dd5cdac2..2978c09860ee 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -663,7 +663,7 @@ config V850E_UART | |||
663 | 663 | ||
664 | config V850E_UARTB | 664 | config V850E_UARTB |
665 | bool | 665 | bool |
666 | depends V850E_UART && V850E_ME2 | 666 | depends on V850E_UART && V850E_ME2 |
667 | default y | 667 | default y |
668 | 668 | ||
669 | config V850E_UART_CONSOLE | 669 | config V850E_UART_CONSOLE |
@@ -909,7 +909,7 @@ config SERIAL_M32R_PLDSIO | |||
909 | 909 | ||
910 | config SERIAL_TXX9 | 910 | config SERIAL_TXX9 |
911 | bool "TMPTX39XX/49XX SIO support" | 911 | bool "TMPTX39XX/49XX SIO support" |
912 | depends HAS_TXX9_SERIAL | 912 | depends on HAS_TXX9_SERIAL |
913 | select SERIAL_CORE | 913 | select SERIAL_CORE |
914 | default y | 914 | default y |
915 | 915 | ||
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c index 7d623003e65e..71e6a24d8c28 100644 --- a/drivers/serial/icom.c +++ b/drivers/serial/icom.c | |||
@@ -1510,7 +1510,7 @@ static int __devinit icom_probe(struct pci_dev *dev, | |||
1510 | } | 1510 | } |
1511 | 1511 | ||
1512 | if ( (retval = pci_request_regions(dev, "icom"))) { | 1512 | if ( (retval = pci_request_regions(dev, "icom"))) { |
1513 | dev_err(&dev->dev, "pci_request_region FAILED\n"); | 1513 | dev_err(&dev->dev, "pci_request_regions FAILED\n"); |
1514 | pci_disable_device(dev); | 1514 | pci_disable_device(dev); |
1515 | return retval; | 1515 | return retval; |
1516 | } | 1516 | } |