diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
commit | 775ba7ad491a154f99871fe603f03366e84ae159 (patch) | |
tree | 7112bd513ff7c60033f4ba07790cab8a7d3195a2 /arch | |
parent | d9405057c18cdc62eade7106a774d87a3e080875 (diff) | |
parent | 18b36c7119aa868fdfae6855b86824db238e5ebc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix inotify maintainers entry
Fix typo in new debug options.
Jon needs a new shift key.
fs: Convert kmalloc() + memset() to kzalloc() in fs/.
configfs.h: Remove dead macro definitions.
kconfig: Standardize "depends" -> "depends on" in Kconfig files
e100: replace kmalloc with kcalloc
um: replace kmalloc+memset with kzalloc
fix typo in net/ipv4/ip_fragment.c
include/linux/compiler.h: reject gcc 3 < gcc 3.2
Kconfig: fix spelling error in config KALLSYMS help text
Remove duplicate "have to" in comment
Fix small typo in drivers/serial/icom.c
Use consistent casing in help message
EXT{2,3,4}_FS: remove outdated part of the help text
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 16 | ||||
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/4xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 4 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 2 | ||||
-rw-r--r-- | arch/um/drivers/net_kern.c | 3 | ||||
-rw-r--r-- | arch/v850/Kconfig | 28 |
8 files changed, 29 insertions, 30 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 9e3d0bdcba07..5c0a10041cd1 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -75,28 +75,28 @@ endmenu | |||
75 | 75 | ||
76 | config MACH_POODLE | 76 | config MACH_POODLE |
77 | bool "Enable Sharp SL-5600 (Poodle) Support" | 77 | bool "Enable Sharp SL-5600 (Poodle) Support" |
78 | depends PXA_SHARPSL_25x | 78 | depends on PXA_SHARPSL_25x |
79 | select SHARP_LOCOMO | 79 | select SHARP_LOCOMO |
80 | select PXA_SSP | 80 | select PXA_SSP |
81 | 81 | ||
82 | config MACH_CORGI | 82 | config MACH_CORGI |
83 | bool "Enable Sharp SL-C700 (Corgi) Support" | 83 | bool "Enable Sharp SL-C700 (Corgi) Support" |
84 | depends PXA_SHARPSL_25x | 84 | depends on PXA_SHARPSL_25x |
85 | select PXA_SHARP_C7xx | 85 | select PXA_SHARP_C7xx |
86 | 86 | ||
87 | config MACH_SHEPHERD | 87 | config MACH_SHEPHERD |
88 | bool "Enable Sharp SL-C750 (Shepherd) Support" | 88 | bool "Enable Sharp SL-C750 (Shepherd) Support" |
89 | depends PXA_SHARPSL_25x | 89 | depends on PXA_SHARPSL_25x |
90 | select PXA_SHARP_C7xx | 90 | select PXA_SHARP_C7xx |
91 | 91 | ||
92 | config MACH_HUSKY | 92 | config MACH_HUSKY |
93 | bool "Enable Sharp SL-C760 (Husky) Support" | 93 | bool "Enable Sharp SL-C760 (Husky) Support" |
94 | depends PXA_SHARPSL_25x | 94 | depends on PXA_SHARPSL_25x |
95 | select PXA_SHARP_C7xx | 95 | select PXA_SHARP_C7xx |
96 | 96 | ||
97 | config MACH_AKITA | 97 | config MACH_AKITA |
98 | bool "Enable Sharp SL-1000 (Akita) Support" | 98 | bool "Enable Sharp SL-1000 (Akita) Support" |
99 | depends PXA_SHARPSL_27x | 99 | depends on PXA_SHARPSL_27x |
100 | select PXA_SHARP_Cxx00 | 100 | select PXA_SHARP_Cxx00 |
101 | select MACH_SPITZ | 101 | select MACH_SPITZ |
102 | select I2C | 102 | select I2C |
@@ -104,17 +104,17 @@ config MACH_AKITA | |||
104 | 104 | ||
105 | config MACH_SPITZ | 105 | config MACH_SPITZ |
106 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | 106 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" |
107 | depends PXA_SHARPSL_27x | 107 | depends on PXA_SHARPSL_27x |
108 | select PXA_SHARP_Cxx00 | 108 | select PXA_SHARP_Cxx00 |
109 | 109 | ||
110 | config MACH_BORZOI | 110 | config MACH_BORZOI |
111 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" | 111 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" |
112 | depends PXA_SHARPSL_27x | 112 | depends on PXA_SHARPSL_27x |
113 | select PXA_SHARP_Cxx00 | 113 | select PXA_SHARP_Cxx00 |
114 | 114 | ||
115 | config MACH_TOSA | 115 | config MACH_TOSA |
116 | bool "Enable Sharp SL-6000x (Tosa) Support" | 116 | bool "Enable Sharp SL-6000x (Tosa) Support" |
117 | depends PXA_SHARPSL_25x | 117 | depends on PXA_SHARPSL_25x |
118 | 118 | ||
119 | config PXA25x | 119 | config PXA25x |
120 | bool | 120 | bool |
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index ec752e16d618..f2dc363de66b 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -113,7 +113,7 @@ endchoice | |||
113 | 113 | ||
114 | config OMAP_SERIAL_WAKE | 114 | config OMAP_SERIAL_WAKE |
115 | bool "Enable wake-up events for serial ports" | 115 | bool "Enable wake-up events for serial ports" |
116 | depends OMAP_MUX | 116 | depends on OMAP_MUX |
117 | default y | 117 | default y |
118 | help | 118 | help |
119 | Select this option if you want to have your system wake up | 119 | Select this option if you want to have your system wake up |
diff --git a/arch/powerpc/platforms/4xx/Kconfig b/arch/powerpc/platforms/4xx/Kconfig index ed39d6a3d22a..2f2a13ed7667 100644 --- a/arch/powerpc/platforms/4xx/Kconfig +++ b/arch/powerpc/platforms/4xx/Kconfig | |||
@@ -179,7 +179,7 @@ config BIOS_FIXUP | |||
179 | # OAK doesn't exist but wanted to keep this around for any future 403GCX boards | 179 | # OAK doesn't exist but wanted to keep this around for any future 403GCX boards |
180 | config 403GCX | 180 | config 403GCX |
181 | bool | 181 | bool |
182 | depends OAK | 182 | depends on OAK |
183 | default y | 183 | default y |
184 | 184 | ||
185 | config 405EP | 185 | config 405EP |
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index ddbe398fbd48..b3c2ce4cb7a8 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig | |||
@@ -35,7 +35,7 @@ config HDPU | |||
35 | Select HDPU if configuring a Sky Computers Compute Blade. | 35 | Select HDPU if configuring a Sky Computers Compute Blade. |
36 | 36 | ||
37 | config HDPU_FEATURES | 37 | config HDPU_FEATURES |
38 | depends HDPU | 38 | depends on HDPU |
39 | tristate "HDPU-Features" | 39 | tristate "HDPU-Features" |
40 | help | 40 | help |
41 | Select to enable HDPU enhanced features. | 41 | Select to enable HDPU enhanced features. |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 692b5ba53209..8eb82efe05a1 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -624,7 +624,7 @@ config HDPU | |||
624 | Select HDPU if configuring a Sky Computers Compute Blade. | 624 | Select HDPU if configuring a Sky Computers Compute Blade. |
625 | 625 | ||
626 | config HDPU_FEATURES | 626 | config HDPU_FEATURES |
627 | depends HDPU | 627 | depends on HDPU |
628 | tristate "HDPU-Features" | 628 | tristate "HDPU-Features" |
629 | help | 629 | help |
630 | Select to enable HDPU enhanced features. | 630 | Select to enable HDPU enhanced features. |
@@ -735,7 +735,7 @@ config LITE5200 | |||
735 | 735 | ||
736 | config LITE5200B | 736 | config LITE5200B |
737 | bool "Freescale LITE5200B" | 737 | bool "Freescale LITE5200B" |
738 | depends LITE5200 | 738 | depends on LITE5200 |
739 | help | 739 | help |
740 | Support for the LITE5200B dev board for the MPC5200 from Freescale. | 740 | Support for the LITE5200B dev board for the MPC5200 from Freescale. |
741 | This is the new board with 2 PCI slots. | 741 | This is the new board with 2 PCI slots. |
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index 293bd489e7d9..6980de420e92 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig | |||
@@ -189,7 +189,7 @@ config BIOS_FIXUP | |||
189 | # OAK doesn't exist but wanted to keep this around for any future 403GCX boards | 189 | # OAK doesn't exist but wanted to keep this around for any future 403GCX boards |
190 | config 403GCX | 190 | config 403GCX |
191 | bool | 191 | bool |
192 | depends OAK | 192 | depends on OAK |
193 | default y | 193 | default y |
194 | 194 | ||
195 | config 405EP | 195 | config 405EP |
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 286bc0b3207f..b2e9762e13c5 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -334,13 +334,12 @@ static int eth_configure(int n, void *init, char *mac, | |||
334 | size = transport->private_size + sizeof(struct uml_net_private) + | 334 | size = transport->private_size + sizeof(struct uml_net_private) + |
335 | sizeof(((struct uml_net_private *) 0)->user); | 335 | sizeof(((struct uml_net_private *) 0)->user); |
336 | 336 | ||
337 | device = kmalloc(sizeof(*device), GFP_KERNEL); | 337 | device = kzalloc(sizeof(*device), GFP_KERNEL); |
338 | if (device == NULL) { | 338 | if (device == NULL) { |
339 | printk(KERN_ERR "eth_configure failed to allocate uml_net\n"); | 339 | printk(KERN_ERR "eth_configure failed to allocate uml_net\n"); |
340 | return(1); | 340 | return(1); |
341 | } | 341 | } |
342 | 342 | ||
343 | memset(device, 0, sizeof(*device)); | ||
344 | INIT_LIST_HEAD(&device->list); | 343 | INIT_LIST_HEAD(&device->list); |
345 | device->index = n; | 344 | device->index = n; |
346 | 345 | ||
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index bcf825875d17..f0d4d72e560f 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig | |||
@@ -105,17 +105,17 @@ menu "Processor type and features" | |||
105 | # currently support | 105 | # currently support |
106 | config V850E_MA1 | 106 | config V850E_MA1 |
107 | bool | 107 | bool |
108 | depends RTE_CB_MA1 | 108 | depends on RTE_CB_MA1 |
109 | default y | 109 | default y |
110 | # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG | 110 | # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG |
111 | config V850E_TEG | 111 | config V850E_TEG |
112 | bool | 112 | bool |
113 | depends RTE_CB_NB85E | 113 | depends on RTE_CB_NB85E |
114 | default y | 114 | default y |
115 | # ... and the RTE-V850E/ME2-CB - V850E/ME2 | 115 | # ... and the RTE-V850E/ME2-CB - V850E/ME2 |
116 | config V850E_ME2 | 116 | config V850E_ME2 |
117 | bool | 117 | bool |
118 | depends RTE_CB_ME2 | 118 | depends on RTE_CB_ME2 |
119 | default y | 119 | default y |
120 | 120 | ||
121 | 121 | ||
@@ -123,7 +123,7 @@ menu "Processor type and features" | |||
123 | 123 | ||
124 | config V850E2_SIM85E2 | 124 | config V850E2_SIM85E2 |
125 | bool | 125 | bool |
126 | depends V850E2_SIM85E2C || V850E2_SIM85E2S | 126 | depends on V850E2_SIM85E2C || V850E2_SIM85E2S |
127 | default y | 127 | default y |
128 | 128 | ||
129 | 129 | ||
@@ -132,7 +132,7 @@ menu "Processor type and features" | |||
132 | # V850E2 processors | 132 | # V850E2 processors |
133 | config V850E2 | 133 | config V850E2 |
134 | bool | 134 | bool |
135 | depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA | 135 | depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA |
136 | default y | 136 | default y |
137 | 137 | ||
138 | 138 | ||
@@ -141,7 +141,7 @@ menu "Processor type and features" | |||
141 | # Boards in the RTE-x-CB series | 141 | # Boards in the RTE-x-CB series |
142 | config RTE_CB | 142 | config RTE_CB |
143 | bool | 143 | bool |
144 | depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2 | 144 | depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2 |
145 | default y | 145 | default y |
146 | 146 | ||
147 | config RTE_CB_MULTI | 147 | config RTE_CB_MULTI |
@@ -149,28 +149,28 @@ menu "Processor type and features" | |||
149 | # RTE_CB_NB85E can either have multi ROM support or not, but | 149 | # RTE_CB_NB85E can either have multi ROM support or not, but |
150 | # other platforms (currently only RTE_CB_MA1) require it. | 150 | # other platforms (currently only RTE_CB_MA1) require it. |
151 | prompt "Multi monitor ROM support" if RTE_CB_NB85E | 151 | prompt "Multi monitor ROM support" if RTE_CB_NB85E |
152 | depends RTE_CB_MA1 || RTE_CB_NB85E | 152 | depends on RTE_CB_MA1 || RTE_CB_NB85E |
153 | default y | 153 | default y |
154 | 154 | ||
155 | config RTE_CB_MULTI_DBTRAP | 155 | config RTE_CB_MULTI_DBTRAP |
156 | bool "Pass illegal insn trap / dbtrap to kernel" | 156 | bool "Pass illegal insn trap / dbtrap to kernel" |
157 | depends RTE_CB_MULTI | 157 | depends on RTE_CB_MULTI |
158 | default n | 158 | default n |
159 | 159 | ||
160 | config RTE_CB_MA1_KSRAM | 160 | config RTE_CB_MA1_KSRAM |
161 | bool "Kernel in SRAM (limits size of kernel)" | 161 | bool "Kernel in SRAM (limits size of kernel)" |
162 | depends RTE_CB_MA1 && RTE_CB_MULTI | 162 | depends on RTE_CB_MA1 && RTE_CB_MULTI |
163 | default n | 163 | default n |
164 | 164 | ||
165 | config RTE_MB_A_PCI | 165 | config RTE_MB_A_PCI |
166 | bool "Mother-A PCI support" | 166 | bool "Mother-A PCI support" |
167 | depends RTE_CB | 167 | depends on RTE_CB |
168 | default y | 168 | default y |
169 | 169 | ||
170 | # The GBUS is used to talk to the RTE-MOTHER-A board | 170 | # The GBUS is used to talk to the RTE-MOTHER-A board |
171 | config RTE_GBUS_INT | 171 | config RTE_GBUS_INT |
172 | bool | 172 | bool |
173 | depends RTE_MB_A_PCI | 173 | depends on RTE_MB_A_PCI |
174 | default y | 174 | default y |
175 | 175 | ||
176 | # The only PCI bus we support is on the RTE-MOTHER-A board | 176 | # The only PCI bus we support is on the RTE-MOTHER-A board |
@@ -209,7 +209,7 @@ menu "Processor type and features" | |||
209 | 209 | ||
210 | config ROM_KERNEL | 210 | config ROM_KERNEL |
211 | bool "Kernel in ROM" | 211 | bool "Kernel in ROM" |
212 | depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2 | 212 | depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2 |
213 | 213 | ||
214 | # Some platforms pre-zero memory, in which case the kernel doesn't need to | 214 | # Some platforms pre-zero memory, in which case the kernel doesn't need to |
215 | config ZERO_BSS | 215 | config ZERO_BSS |
@@ -225,10 +225,10 @@ menu "Processor type and features" | |||
225 | 225 | ||
226 | config V850E_HIGHRES_TIMER | 226 | config V850E_HIGHRES_TIMER |
227 | bool "High resolution timer support" | 227 | bool "High resolution timer support" |
228 | depends V850E_TIMER_D | 228 | depends on V850E_TIMER_D |
229 | config TIME_BOOTUP | 229 | config TIME_BOOTUP |
230 | bool "Time bootup" | 230 | bool "Time bootup" |
231 | depends V850E_HIGHRES_TIMER | 231 | depends on V850E_HIGHRES_TIMER |
232 | 232 | ||
233 | config RESET_GUARD | 233 | config RESET_GUARD |
234 | bool "Reset Guard" | 234 | bool "Reset Guard" |