projects / openwrt / staging / florian.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
changed Makefile and profiles, added patches for kernel 2.6.24 (stable-branch of...
[openwrt/staging/florian.git] / target / linux / s3c24xx / patches-2.6.24 / 1124-OpenMoko-Openmoko.patch
1 From f761294475ddac8ecb74b5ef6c7cb7b0e7f71e0b Mon Sep 17 00:00:00 2001
2 From: Holger Freyther <zecke@openmoko.org>
3 Date: Sun, 13 Apr 2008 07:25:57 +0100
4 Subject: [PATCH] OpenMoko => Openmoko
5
6 Signed-Off-By: Holger Freyther <zecke@openmoko.org>
7 ---
8 arch/arm/mach-s3c2410/mach-gta01.c | 2 +-
9 arch/arm/mach-s3c2410/mach-qt2410.c | 2 +-
10 arch/arm/mach-s3c2410/pwm.c | 2 +-
11 arch/arm/mach-s3c2440/Kconfig | 2 +-
12 arch/arm/mach-s3c2440/mach-gta02.c | 2 +-
13 arch/arm/mach-s3c2440/mach-hxd8.c | 2 +-
14 arch/arm/plat-s3c24xx/neo1973_pm_bt.c | 2 +-
15 arch/arm/plat-s3c24xx/neo1973_pm_gps.c | 2 +-
16 arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 2 +-
17 arch/arm/plat-s3c24xx/neo1973_pm_host.c | 2 +-
18 arch/arm/plat-s3c24xx/neo1973_version.c | 2 +-
19 build | 2 +-
20 drivers/i2c/chips/pcf50606.c | 2 +-
21 drivers/i2c/chips/pcf50606.h | 2 +-
22 drivers/i2c/chips/pcf50633.c | 2 +-
23 drivers/i2c/chips/pcf50633.h | 2 +-
24 drivers/input/keyboard/neo1973kbd.c | 2 +-
25 drivers/input/keyboard/qt2410kbd.c | 2 +-
26 drivers/input/misc/lis302dl.c | 2 +-
27 drivers/leds/leds-neo1973-gta02.c | 2 +-
28 drivers/leds/leds-neo1973-vibrator.c | 2 +-
29 drivers/mfd/glamo/Kconfig | 2 +-
30 drivers/mfd/glamo/glamo-core.c | 2 +-
31 drivers/mfd/glamo/glamo-fb.c | 4 ++--
32 drivers/mfd/glamo/glamo-lcm-spi.c | 2 +-
33 drivers/mfd/glamo/glamo-mci.c | 4 ++--
34 drivers/mfd/glamo/glamo-mci.h | 2 +-
35 drivers/mfd/glamo/glamo-regs.h | 2 +-
36 drivers/mfd/glamo/glamo-spi-gpio.c | 2 +-
37 drivers/power/gta02_hdq.c | 2 +-
38 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 2 +-
39 drivers/video/backlight/gta01_bl.c | 2 +-
40 drivers/video/display/Kconfig | 2 +-
41 drivers/video/display/jbt6k74.c | 2 +-
42 drivers/video/logo/Kconfig | 2 +-
43 drivers/video/logo/logo.c | 2 +-
44 sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +-
45 37 files changed, 39 insertions(+), 39 deletions(-)
46
47 diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
48 index 0543daa..8c1a402 100644
49 --- a/arch/arm/mach-s3c2410/mach-gta01.c
50 +++ b/arch/arm/mach-s3c2410/mach-gta01.c
51 @@ -3,7 +3,7 @@
52 *
53 * S3C2410 Machine Support for the FIC Neo1973 GTA01
54 *
55 - * Copyright (C) 2006-2007 by OpenMoko, Inc.
56 + * Copyright (C) 2006-2007 by Openmoko, Inc.
57 * Author: Harald Welte <laforge@openmoko.org>
58 * All rights reserved.
59 *
60 diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
61 index daf94cd..f446996 100644
62 --- a/arch/arm/mach-s3c2410/mach-qt2410.c
63 +++ b/arch/arm/mach-s3c2410/mach-qt2410.c
64 @@ -1,6 +1,6 @@
65 /* linux/arch/arm/mach-s3c2410/mach-qt2410.c
66 *
67 - * Copyright (C) 2006 by OpenMoko, Inc.
68 + * Copyright (C) 2006 by Openmoko, Inc.
69 * Author: Harald Welte <laforge@openmoko.org>
70 * All rights reserved.
71 *
72 diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
73 index 8a07359..23738c1 100644
74 --- a/arch/arm/mach-s3c2410/pwm.c
75 +++ b/arch/arm/mach-s3c2410/pwm.c
76 @@ -2,7 +2,7 @@
77 * arch/arm/mach-s3c2410/3c2410-pwm.c
78 *
79 * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
80 - * for the OpenMoko Project.
81 + * for the Openmoko Project.
82 *
83 * S3C2410A SoC PWM support
84 *
85 diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
86 index 71719ac..c40aaca 100644
87 --- a/arch/arm/mach-s3c2440/Kconfig
88 +++ b/arch/arm/mach-s3c2440/Kconfig
89 @@ -96,7 +96,7 @@ config NEO1973_GTA02_2440
90 select CPU_S3C2440
91 help
92 Say Y here if you are using an early hardware revision
93 - of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
94 + of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
95
96 endmenu
97
98 diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
99 index bd2888a..f9e00d5 100644
100 --- a/arch/arm/mach-s3c2440/mach-gta02.c
101 +++ b/arch/arm/mach-s3c2440/mach-gta02.c
102 @@ -3,7 +3,7 @@
103 *
104 * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
105 *
106 - * Copyright (C) 2006-2007 by OpenMoko, Inc.
107 + * Copyright (C) 2006-2007 by Openmoko, Inc.
108 * Author: Harald Welte <laforge@openmoko.org>
109 * All rights reserved.
110 *
111 diff --git a/arch/arm/mach-s3c2440/mach-hxd8.c b/arch/arm/mach-s3c2440/mach-hxd8.c
112 index 3400ed3..6690931 100644
113 --- a/arch/arm/mach-s3c2440/mach-hxd8.c
114 +++ b/arch/arm/mach-s3c2440/mach-hxd8.c
115 @@ -2,7 +2,7 @@
116 *
117 * S3C2440 Machine Support for the FIC HXD8
118 *
119 - * Copyright (c) 2007 OpenMoko, Inc.
120 + * Copyright (c) 2007 Openmoko, Inc.
121 * Author: Harald Welte <laforge@openmoko.org>
122 * All rights reserved.
123 *
124 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
125 index 8f5be88..a9694b4 100644
126 --- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
127 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
128 @@ -1,7 +1,7 @@
129 /*
130 * Bluetooth PM code for the FIC Neo1973 GSM Phone
131 *
132 - * (C) 2007 by OpenMoko Inc.
133 + * (C) 2007 by Openmoko Inc.
134 * Author: Harald Welte <laforge@openmoko.org>
135 * All rights reserved.
136 *
137 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
138 index b12f7bc..d882f7b 100644
139 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
140 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
141 @@ -1,7 +1,7 @@
142 /*
143 * GPS Power Management code for the FIC Neo1973 GSM Phone
144 *
145 - * (C) 2007 by OpenMoko Inc.
146 + * (C) 2007 by Openmoko Inc.
147 * Author: Harald Welte <laforge@openmoko.org>
148 * All rights reserved.
149 *
150 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
151 index c3292b8..f22cad8 100644
152 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
153 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
154 @@ -1,7 +1,7 @@
155 /*
156 * GSM Management code for the FIC Neo1973 GSM Phone
157 *
158 - * (C) 2007 by OpenMoko Inc.
159 + * (C) 2007 by Openmoko Inc.
160 * Author: Harald Welte <laforge@openmoko.org>
161 * All rights reserved.
162 *
163 diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
164 index 4eae341..8aee609 100644
165 --- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
166 +++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
167 @@ -1,7 +1,7 @@
168 /*
169 * Bluetooth PM code for the FIC Neo1973 GSM Phone
170 *
171 - * (C) 2007 by OpenMoko Inc.
172 + * (C) 2007 by Openmoko Inc.
173 * Author: Harald Welte <laforge@openmoko.org>
174 * All rights reserved.
175 *
176 diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
177 index ad41a0f..ab4805b 100644
178 --- a/arch/arm/plat-s3c24xx/neo1973_version.c
179 +++ b/arch/arm/plat-s3c24xx/neo1973_version.c
180 @@ -1,7 +1,7 @@
181 /*
182 * PCB version sysfs for the FIC Neo1973 GSM Phone
183 *
184 - * (C) 2007 by OpenMoko Inc.
185 + * (C) 2007 by Openmoko Inc.
186 * Author: Andy Green <andy@openmoko.com>
187 * All rights reserved.
188 *
189 diff --git a/build b/build
190 index 728454d..12e06bf 100755
191 --- a/build
192 +++ b/build
193 @@ -7,7 +7,7 @@ make -f synthesize-gta-module-configs.mak
194 make ARCH=arm silentoldconfig
195 if make -j5 ARCH=arm; then
196 ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
197 - mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
198 + mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
199 exit 0
200 else
201 exit 1
202 diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
203 index 03805be..6f71e6c 100644
204 --- a/drivers/i2c/chips/pcf50606.c
205 +++ b/drivers/i2c/chips/pcf50606.c
206 @@ -1,6 +1,6 @@
207 /* Philips/NXP PCF50606 Power Management Unit (PMU) driver
208 *
209 - * (C) 2006-2007 by OpenMoko, Inc.
210 + * (C) 2006-2007 by Openmoko, Inc.
211 * Authors: Harald Welte <laforge@openmoko.org>,
212 * Matt Hsu <matt@openmoko.org>
213 * All rights reserved.
214 diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
215 index 15b350f..5eded96 100644
216 --- a/drivers/i2c/chips/pcf50606.h
217 +++ b/drivers/i2c/chips/pcf50606.h
218 @@ -2,7 +2,7 @@
219 #define _PCF50606_H
220
221 /* Philips PCF50606 Power Managemnt Unit (PMU) driver
222 - * (C) 2006-2007 by OpenMoko, Inc.
223 + * (C) 2006-2007 by Openmoko, Inc.
224 * Author: Harald Welte <laforge@openmoko.org>
225 *
226 */
227 diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
228 index b5cd2cb..09d5cfd 100644
229 --- a/drivers/i2c/chips/pcf50633.c
230 +++ b/drivers/i2c/chips/pcf50633.c
231 @@ -1,6 +1,6 @@
232 /* Philips PCF50633 Power Management Unit (PMU) driver
233 *
234 - * (C) 2006-2007 by OpenMoko, Inc.
235 + * (C) 2006-2007 by Openmoko, Inc.
236 * Author: Harald Welte <laforge@openmoko.org>
237 * All rights reserved.
238 *
239 diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
240 index 9aad206..93dfd99 100644
241 --- a/drivers/i2c/chips/pcf50633.h
242 +++ b/drivers/i2c/chips/pcf50633.h
243 @@ -2,7 +2,7 @@
244 #define _PCF50633_H
245
246 /* Philips PCF50633 Power Managemnt Unit (PMU) driver
247 - * (C) 2006-2007 by OpenMoko, Inc.
248 + * (C) 2006-2007 by Openmoko, Inc.
249 * Author: Harald Welte <laforge@openmoko.org>
250 *
251 */
252 diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
253 index 6c96660..a1fc7a3 100644
254 --- a/drivers/input/keyboard/neo1973kbd.c
255 +++ b/drivers/input/keyboard/neo1973kbd.c
256 @@ -1,7 +1,7 @@
257 /*
258 * Keyboard driver for FIC Neo1973 GSM phone
259 *
260 - * (C) 2006-2007 by OpenMoko, Inc.
261 + * (C) 2006-2007 by Openmoko, Inc.
262 * Author: Harald Welte <laforge@openmoko.org>
263 * All rights reserved.
264 *
265 diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
266 index 4d497a3..fa4bf32 100644
267 --- a/drivers/input/keyboard/qt2410kbd.c
268 +++ b/drivers/input/keyboard/qt2410kbd.c
269 @@ -1,7 +1,7 @@
270 /*
271 * Keyboard driver for Armzone QT2410
272 *
273 - * (C) 2006 by OpenMoko, Inc.
274 + * (C) 2006 by Openmoko, Inc.
275 * Author: Harald Welte <laforge@openmoko.org>
276 * All rights reserved.
277 *
278 diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
279 index 2be816a..6067dba 100644
280 --- a/drivers/input/misc/lis302dl.c
281 +++ b/drivers/input/misc/lis302dl.c
282 @@ -1,6 +1,6 @@
283 /* Linux kernel driver for the ST LIS302D 3-axis accelerometer
284 *
285 - * Copyright (C) 2007 by OpenMoko, Inc.
286 + * Copyright (C) 2007 by Openmoko, Inc.
287 * Author: Harald Welte <laforge@openmoko.org>
288 * All rights reserved.
289 *
290 diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
291 index bf1d540..8678670 100644
292 --- a/drivers/leds/leds-neo1973-gta02.c
293 +++ b/drivers/leds/leds-neo1973-gta02.c
294 @@ -1,7 +1,7 @@
295 /*
296 * LED driver for the FIC Neo1973 GTA02 GSM phone
297 *
298 - * (C) 2006-2007 by OpenMoko, Inc.
299 + * (C) 2006-2007 by Openmoko, Inc.
300 * Author: Harald Welte <laforge@openmoko.org>
301 * All rights reserved.
302 *
303 diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
304 index 36ed216..f31302d 100644
305 --- a/drivers/leds/leds-neo1973-vibrator.c
306 +++ b/drivers/leds/leds-neo1973-vibrator.c
307 @@ -1,7 +1,7 @@
308 /*
309 * LED driver for the vibrator of the FIC Neo1973 GSM Phone
310 *
311 - * (C) 2006-2007 by OpenMoko, Inc.
312 + * (C) 2006-2007 by Openmoko, Inc.
313 * Author: Harald Welte <laforge@openmoko.org>
314 * All rights reserved.
315 *
316 diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
317 index ec2ae3d..86a7c40 100644
318 --- a/drivers/mfd/glamo/Kconfig
319 +++ b/drivers/mfd/glamo/Kconfig
320 @@ -38,7 +38,7 @@ config MFD_GLAMO_MCI
321 depends on MFD_GLAMO && MMC
322 help
323 This selects a driver for the MCI interface found in
324 - the S-Media GLAMO chip, as used in OpenMoko
325 + the S-Media GLAMO chip, as used in Openmoko
326 neo1973 GTA-02.
327
328 If unsure, say N.
329 \ No newline at end of file
330 diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
331 index 19ca363..34b2a01 100644
332 --- a/drivers/mfd/glamo/glamo-core.c
333 +++ b/drivers/mfd/glamo/glamo-core.c
334 @@ -1,6 +1,6 @@
335 /* Smedia Glamo 336x/337x driver
336 *
337 - * (C) 2007 by OpenMoko, Inc.
338 + * (C) 2007 by Openmoko, Inc.
339 * Author: Harald Welte <laforge@openmoko.org>
340 * All rights reserved.
341 *
342 diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
343 index 8633e44..edc6d9c 100644
344 --- a/drivers/mfd/glamo/glamo-fb.c
345 +++ b/drivers/mfd/glamo/glamo-fb.c
346 @@ -1,6 +1,6 @@
347 /* Smedia Glamo 336x/337x driver
348 *
349 - * (C) 2007 by OpenMoko, Inc.
350 + * (C) 2007 by Openmoko, Inc.
351 * Author: Harald Welte <laforge@openmoko.org>
352 * All rights reserved.
353 *
354 @@ -684,7 +684,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
355 struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
356
357 printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
358 - "OpenMoko, Inc.\n");
359 + "Openmoko, Inc.\n");
360
361 fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
362 if (!fbinfo)
363 diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
364 index 92cabe4..874fb0e 100644
365 --- a/drivers/mfd/glamo/glamo-lcm-spi.c
366 +++ b/drivers/mfd/glamo/glamo-lcm-spi.c
367 @@ -1,5 +1,5 @@
368 /*
369 - * Copyright (C) 2007 OpenMoko, Inc.
370 + * Copyright (C) 2007 Openmoko, Inc.
371 * Author: Harald Welte <laforge@openmoko.org>
372 *
373 * Smedia Glamo GPIO based SPI driver
374 diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
375 index d8847c5..05bbfc4 100644
376 --- a/drivers/mfd/glamo/glamo-mci.c
377 +++ b/drivers/mfd/glamo/glamo-mci.c
378 @@ -1,7 +1,7 @@
379 /*
380 * linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
381 *
382 - * Copyright (C) 2007 OpenMoko, Inc, Andy Green <andy@openmoko.com>
383 + * Copyright (C) 2007 Openmoko, Inc, Andy Green <andy@openmoko.com>
384 * Based on S3C MMC driver that was:
385 * Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
386 *
387 @@ -661,7 +661,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
388 struct glamo_mci_host *host;
389 int ret;
390
391 - dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
392 + dev_info(&pdev->dev, "glamo_mci driver (C)2007 Openmoko, Inc\n");
393
394 mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
395 if (!mmc) {
396 diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
397 index 55852e7..f3f170e 100644
398 --- a/drivers/mfd/glamo/glamo-mci.h
399 +++ b/drivers/mfd/glamo/glamo-mci.h
400 @@ -1,7 +1,7 @@
401 /*
402 * linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
403 *
404 - * Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
405 + * Copyright (C) 2007-2008 Openmoko, Inc, Andy Green <andy@openmoko.com>
406 * based on S3C MMC driver -->
407 * Copyright (C) 2004-2006 Thomas Kleffel, All Rights Reserved.
408 *
409 diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
410 index 8f6c45c..32411e3 100644
411 --- a/drivers/mfd/glamo/glamo-regs.h
412 +++ b/drivers/mfd/glamo/glamo-regs.h
413 @@ -3,7 +3,7 @@
414
415 /* Smedia Glamo 336x/337x driver
416 *
417 - * (C) 2007 by OpenMoko, Inc.
418 + * (C) 2007 by Openmoko, Inc.
419 * Author: Harald Welte <laforge@openmoko.org>
420 * All rights reserved.
421 *
422 diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
423 index eda7322..ece5750 100644
424 --- a/drivers/mfd/glamo/glamo-spi-gpio.c
425 +++ b/drivers/mfd/glamo/glamo-spi-gpio.c
426 @@ -1,5 +1,5 @@
427 /*
428 - * Copyright (C) 2007 OpenMoko, Inc.
429 + * Copyright (C) 2007 Openmoko, Inc.
430 * Author: Harald Welte <laforge@openmoko.org>
431 *
432 * Smedia Glamo GPIO based SPI driver
433 diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
434 index 12c742e..5a79fd6 100644
435 --- a/drivers/power/gta02_hdq.c
436 +++ b/drivers/power/gta02_hdq.c
437 @@ -1,7 +1,7 @@
438 /*
439 * HDQ driver for the FIC Neo1973 GTA02 GSM phone
440 *
441 - * (C) 2006-2007 by OpenMoko, Inc.
442 + * (C) 2006-2007 by Openmoko, Inc.
443 * Author: Andy Green <andy@openmoko.com>
444 * All rights reserved.
445 *
446 diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
447 index 3c4758b..8c3bbbc 100644
448 --- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
449 +++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
450 @@ -1,7 +1,7 @@
451 /*
452 * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
453 *
454 - * Copyright (C) 2007 by OpenMoko, Inc.
455 + * Copyright (C) 2007 by Openmoko, Inc.
456 * Written by Samuel Ortiz <sameo@openedhand.com>
457 * All Rights Reserved
458 *
459 diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
460 index c2bf0c9..bd7d41f 100644
461 --- a/drivers/video/backlight/gta01_bl.c
462 +++ b/drivers/video/backlight/gta01_bl.c
463 @@ -1,7 +1,7 @@
464 /*
465 * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
466 *
467 - * Copyright (C) 2006-2007 by OpenMoko, Inc.
468 + * Copyright (C) 2006-2007 by Openmoko, Inc.
469 * Author: Harald Welte <laforge@openmoko.org>
470 * All rights reserved.
471 *
472 diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
473 index f0da483..674dc2c 100644
474 --- a/drivers/video/display/Kconfig
475 +++ b/drivers/video/display/Kconfig
476 @@ -27,7 +27,7 @@ config DISPLAY_JBT6K74
477 help
478 SPI driver for the control interface of TFT panels containing
479 the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
480 - TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
481 + TFT diplay module used in the FIC/Openmoko Neo1973 GSM phones.
482
483 The control interface is required for display operation, as it
484 controls power management, display timing and gamma calibration.
485 diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
486 index d7e9442..7e11da7 100644
487 --- a/drivers/video/display/jbt6k74.c
488 +++ b/drivers/video/display/jbt6k74.c
489 @@ -1,6 +1,6 @@
490 /* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
491 *
492 - * Copyright (C) 2006-2007 by OpenMoko, Inc.
493 + * Copyright (C) 2006-2007 by Openmoko, Inc.
494 * Author: Harald Welte <laforge@openmoko.org>,
495 * Stefan Schmidt <stefan@openmoko.org>
496 * All rights reserved.
497 diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
498 index 6d97d00..def3167 100644
499 --- a/drivers/video/logo/Kconfig
500 +++ b/drivers/video/logo/Kconfig
501 @@ -68,7 +68,7 @@ config LOGO_SUPERH_CLUT224
502 default y
503
504 config LOGO_OPENMOKO_CLUT224
505 - bool "224-color OpenMoko Linux logo"
506 + bool "224-color Openmoko Linux logo"
507 depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
508 default y
509
510 diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
511 index 541fd97..4f026f8 100644
512 --- a/drivers/video/logo/logo.c
513 +++ b/drivers/video/logo/logo.c
514 @@ -107,7 +107,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
515 logo = &logo_m32r_clut224;
516 #endif
517 #ifdef CONFIG_LOGO_OPENMOKO_CLUT224
518 - /* OpenMoko Linux logo */
519 + /* Openmoko Linux logo */
520 logo = &logo_openmoko_clut224;
521 #endif
522 }
523 diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
524 index f32cba3..dbc9c18 100644
525 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
526 +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
527 @@ -1,7 +1,7 @@
528 /*
529 * neo1973_gta02_wm8753.c -- SoC audio for Neo1973
530 *
531 - * Copyright 2007 OpenMoko Inc
532 + * Copyright 2007 Openmoko Inc
533 * Author: Graeme Gregory <graeme@openmoko.org>
534 * Copyright 2007 Wolfson Microelectronics PLC.
535 * Author: Graeme Gregory <linux@wolfsonmicro.com>
536 --
537 1.5.6.5
538
Staging tree of florian