aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/s3c24xx/patches-2.6.26/1112-OpenMoko-Openmoko.patch
blob: 39296c3fce6bc39cb1b9dc1bda7faea087f9bf00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
From 2ffd2dab18cc5b69aec914c15f44c6343cfe38df Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Fri, 25 Jul 2008 23:06:05 +0100
Subject: [PATCH] OpenMoko => Openmoko

Signed-Off-By: Holger Freyther <zecke@openmoko.org>
---
 arch/arm/mach-s3c2410/mach-gta01.c       |    2 +-
 arch/arm/mach-s3c2410/mach-qt2410.c      |    2 +-
 arch/arm/mach-s3c2410/pwm.c              |    2 +-
 arch/arm/mach-s3c2440/Kconfig            |    2 +-
 arch/arm/mach-s3c2440/mach-gta02.c       |    2 +-
 arch/arm/plat-s3c24xx/neo1973_pm_bt.c    |    2 +-
 arch/arm/plat-s3c24xx/neo1973_pm_gps.c   |    2 +-
 arch/arm/plat-s3c24xx/neo1973_pm_gsm.c   |    2 +-
 arch/arm/plat-s3c24xx/neo1973_pm_host.c  |    2 +-
 arch/arm/plat-s3c24xx/neo1973_version.c  |    2 +-
 build                                    |    2 +-
 drivers/i2c/chips/pcf50606.c             |    2 +-
 drivers/i2c/chips/pcf50606.h             |    2 +-
 drivers/i2c/chips/pcf50633.c             |    2 +-
 drivers/i2c/chips/pcf50633.h             |    2 +-
 drivers/input/keyboard/neo1973kbd.c      |    2 +-
 drivers/input/keyboard/qt2410kbd.c       |    2 +-
 drivers/input/misc/lis302dl.c            |    2 +-
 drivers/leds/leds-neo1973-gta02.c        |    2 +-
 drivers/leds/leds-neo1973-vibrator.c     |    2 +-
 drivers/mfd/glamo/Kconfig                |    2 +-
 drivers/mfd/glamo/glamo-core.c           |    2 +-
 drivers/mfd/glamo/glamo-fb.c             |    4 ++--
 drivers/mfd/glamo/glamo-lcm-spi.c        |    2 +-
 drivers/mfd/glamo/glamo-mci.c            |    4 ++--
 drivers/mfd/glamo/glamo-mci.h            |    2 +-
 drivers/mfd/glamo/glamo-regs.h           |    2 +-
 drivers/mfd/glamo/glamo-spi-gpio.c       |    2 +-
 drivers/power/gta02_hdq.c                |    2 +-
 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c   |    2 +-
 drivers/video/backlight/gta01_bl.c       |    2 +-
 drivers/video/display/Kconfig            |    2 +-
 drivers/video/display/jbt6k74.c          |    2 +-
 drivers/video/logo/Kconfig               |    2 +-
 drivers/video/logo/logo.c                |    2 +-
 sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    2 +-
 36 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
index 0543daa..8c1a402 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -3,7 +3,7 @@
  *
  * S3C2410 Machine Support for the FIC Neo1973 GTA01
  *
- * Copyright (C) 2006-2007 by OpenMoko, Inc.
+ * Copyright (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index daf94cd..f446996 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/mach-qt2410.c
  *
- * Copyright (C) 2006 by OpenMoko, Inc.
+ * Copyright (C) 2006 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
index 8a07359..23738c1 100644
--- a/arch/arm/mach-s3c2410/pwm.c
+++ b/arch/arm/mach-s3c2410/pwm.c
@@ -2,7 +2,7 @@
  * arch/arm/mach-s3c2410/3c2410-pwm.c
  *
  * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
- * 		 for the OpenMoko Project.
+ * 		 for the Openmoko Project.
  *
  *     S3C2410A SoC PWM support
  *
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index b417f8e..3e9e9f1 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -90,7 +90,7 @@ config NEO1973_GTA02_2440
 	select CPU_S3C2440
 	help
 	   Say Y here if you are using an early hardware revision
-	   of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
+	   of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
 
 endmenu
 
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index bd2888a..f9e00d5 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -3,7 +3,7 @@
  *
  * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
  *
- * Copyright (C) 2006-2007 by OpenMoko, Inc.
+ * Copyright (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
index 8f5be88..a9694b4 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
@@ -1,7 +1,7 @@
 /*
  * Bluetooth PM code for the FIC Neo1973 GSM Phone
  *
- * (C) 2007 by OpenMoko Inc.
+ * (C) 2007 by Openmoko Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index b12f7bc..d882f7b 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -1,7 +1,7 @@
 /*
  * GPS Power Management code for the FIC Neo1973 GSM Phone
  *
- * (C) 2007 by OpenMoko Inc.
+ * (C) 2007 by Openmoko Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
index c3292b8..f22cad8 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
@@ -1,7 +1,7 @@
 /*
  * GSM Management code for the FIC Neo1973 GSM Phone
  *
- * (C) 2007 by OpenMoko Inc.
+ * (C) 2007 by Openmoko Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
index 4eae341..8aee609 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
@@ -1,7 +1,7 @@
 /*
  * Bluetooth PM code for the FIC Neo1973 GSM Phone
  *
- * (C) 2007 by OpenMoko Inc.
+ * (C) 2007 by Openmoko Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
index ad41a0f..ab4805b 100644
--- a/arch/arm/plat-s3c24xx/neo1973_version.c
+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
@@ -1,7 +1,7 @@
 /*
  * PCB version sysfs for the FIC Neo1973 GSM Phone
  *
- * (C) 2007 by OpenMoko Inc.
+ * (C) 2007 by Openmoko Inc.
  * Author: Andy Green <andy@openmoko.com>
  * All rights reserved.
  *
diff --git a/build b/build
index 7e61ea2..5bd3d2d 100755
--- a/build
+++ b/build
@@ -6,7 +6,7 @@ export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
 make ARCH=arm silentoldconfig
 if make -j5 ARCH=arm; then
 	${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
-	mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
+	mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
 	exit 0
 else
 	exit 1
diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
index 03805be..6f71e6c 100644
--- a/drivers/i2c/chips/pcf50606.c
+++ b/drivers/i2c/chips/pcf50606.c
@@ -1,6 +1,6 @@
 /* Philips/NXP PCF50606 Power Management Unit (PMU) driver
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Authors: Harald Welte <laforge@openmoko.org>,
  *	    Matt Hsu <matt@openmoko.org>
  * All rights reserved.
diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
index 15b350f..5eded96 100644
--- a/drivers/i2c/chips/pcf50606.h
+++ b/drivers/i2c/chips/pcf50606.h
@@ -2,7 +2,7 @@
 #define _PCF50606_H
 
 /* Philips PCF50606 Power Managemnt Unit (PMU) driver
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  *
  */
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index b5cd2cb..09d5cfd 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -1,6 +1,6 @@
 /* Philips PCF50633 Power Management Unit (PMU) driver
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
index 9aad206..93dfd99 100644
--- a/drivers/i2c/chips/pcf50633.h
+++ b/drivers/i2c/chips/pcf50633.h
@@ -2,7 +2,7 @@
 #define _PCF50633_H
 
 /* Philips PCF50633 Power Managemnt Unit (PMU) driver
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  *
  */
diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
index 6c96660..a1fc7a3 100644
--- a/drivers/input/keyboard/neo1973kbd.c
+++ b/drivers/input/keyboard/neo1973kbd.c
@@ -1,7 +1,7 @@
 /*
  * Keyboard driver for FIC Neo1973 GSM phone
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
index 4d497a3..fa4bf32 100644
--- a/drivers/input/keyboard/qt2410kbd.c
+++ b/drivers/input/keyboard/qt2410kbd.c
@@ -1,7 +1,7 @@
 /*
  * Keyboard driver for Armzone QT2410
  *
- * (C) 2006 by OpenMoko, Inc.
+ * (C) 2006 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
index 2be816a..6067dba 100644
--- a/drivers/input/misc/lis302dl.c
+++ b/drivers/input/misc/lis302dl.c
@@ -1,6 +1,6 @@
 /* Linux kernel driver for the ST LIS302D 3-axis accelerometer
  *
- * Copyright (C) 2007 by OpenMoko, Inc.
+ * Copyright (C) 2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
index bf1d540..8678670 100644
--- a/drivers/leds/leds-neo1973-gta02.c
+++ b/drivers/leds/leds-neo1973-gta02.c
@@ -1,7 +1,7 @@
 /*
  * LED driver for the FIC Neo1973 GTA02 GSM phone
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index 36ed216..f31302d 100644
--- a/drivers/leds/leds-neo1973-vibrator.c
+++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -1,7 +1,7 @@
 /*
  * LED driver for the vibrator of the FIC Neo1973 GSM Phone
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
index ec2ae3d..86a7c40 100644
--- a/drivers/mfd/glamo/Kconfig
+++ b/drivers/mfd/glamo/Kconfig
@@ -38,7 +38,7 @@ config MFD_GLAMO_MCI
 	depends on MFD_GLAMO && MMC
 	help
 	  This selects a driver for the MCI interface found in
-	  the S-Media GLAMO chip, as used in OpenMoko
+	  the S-Media GLAMO chip, as used in Openmoko
 	  neo1973 GTA-02.
 
 	  If unsure, say N.
\ No newline at end of file
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index ab90690..a6b977b 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -1,6 +1,6 @@
 /* Smedia Glamo 336x/337x driver
  *
- * (C) 2007 by OpenMoko, Inc.
+ * (C) 2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
index 8633e44..edc6d9c 100644
--- a/drivers/mfd/glamo/glamo-fb.c
+++ b/drivers/mfd/glamo/glamo-fb.c
@@ -1,6 +1,6 @@
 /* Smedia Glamo 336x/337x driver
  *
- * (C) 2007 by OpenMoko, Inc.
+ * (C) 2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
@@ -684,7 +684,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
 	struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
 
 	printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
-		"OpenMoko, Inc.\n");
+		"Openmoko, Inc.\n");
 
 	fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
 	if (!fbinfo)
diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
index 92cabe4..874fb0e 100644
--- a/drivers/mfd/glamo/glamo-lcm-spi.c
+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 OpenMoko, Inc.
+ * Copyright (C) 2007 Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  *
  * Smedia Glamo GPIO based SPI driver
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index d8847c5..05bbfc4 100644
--- a/drivers/mfd/glamo/glamo-mci.c
+++ b/drivers/mfd/glamo/glamo-mci.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
  *
- *  Copyright (C) 2007 OpenMoko, Inc,  Andy Green <andy@openmoko.com>
+ *  Copyright (C) 2007 Openmoko, Inc,  Andy Green <andy@openmoko.com>
  *  Based on S3C MMC driver that was:
  *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
  *
@@ -661,7 +661,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
 	struct glamo_mci_host 	*host;
 	int ret;
 
-	dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
+	dev_info(&pdev->dev, "glamo_mci driver (C)2007 Openmoko, Inc\n");
 
 	mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
 	if (!mmc) {
diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
index 55852e7..f3f170e 100644
--- a/drivers/mfd/glamo/glamo-mci.h
+++ b/drivers/mfd/glamo/glamo-mci.h
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
  *
- *  Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
+ *  Copyright (C) 2007-2008 Openmoko, Inc, Andy Green <andy@openmoko.com>
  *   based on S3C MMC driver -->
  *  Copyright (C) 2004-2006 Thomas Kleffel, All Rights Reserved.
  *
diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
index 8f6c45c..32411e3 100644
--- a/drivers/mfd/glamo/glamo-regs.h
+++ b/drivers/mfd/glamo/glamo-regs.h
@@ -3,7 +3,7 @@
 
 /* Smedia Glamo 336x/337x driver
  *
- * (C) 2007 by OpenMoko, Inc.
+ * (C) 2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
index eda7322..ece5750 100644
--- a/drivers/mfd/glamo/glamo-spi-gpio.c
+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 OpenMoko, Inc.
+ * Copyright (C) 2007 Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  *
  * Smedia Glamo GPIO based SPI driver
diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
index 12c742e..5a79fd6 100644
--- a/drivers/power/gta02_hdq.c
+++ b/drivers/power/gta02_hdq.c
@@ -1,7 +1,7 @@
 /*
  * HDQ driver for the FIC Neo1973 GTA02 GSM phone
  *
- * (C) 2006-2007 by OpenMoko, Inc.
+ * (C) 2006-2007 by Openmoko, Inc.
  * Author: Andy Green <andy@openmoko.com>
  * All rights reserved.
  *
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
index 3c4758b..8c3bbbc 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -1,7 +1,7 @@
 /*
  * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
  *
- * Copyright (C) 2007 by OpenMoko, Inc.
+ * Copyright (C) 2007 by Openmoko, Inc.
  * Written by Samuel Ortiz <sameo@openedhand.com>
  * All Rights Reserved
  *
diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
index c2bf0c9..bd7d41f 100644
--- a/drivers/video/backlight/gta01_bl.c
+++ b/drivers/video/backlight/gta01_bl.c
@@ -1,7 +1,7 @@
 /*
  *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
  *
- * Copyright (C) 2006-2007 by OpenMoko, Inc.
+ * Copyright (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
  * All rights reserved.
  *
diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
index f0da483..674dc2c 100644
--- a/drivers/video/display/Kconfig
+++ b/drivers/video/display/Kconfig
@@ -27,7 +27,7 @@ config DISPLAY_JBT6K74
 	help
 	  SPI driver for the control interface of TFT panels containing
 	  the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
-	  TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
+	  TFT diplay module used in the FIC/Openmoko Neo1973 GSM phones.
 
 	  The control interface is required for display operation, as it
 	  controls power management, display timing and gamma calibration.
diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
index d7e9442..7e11da7 100644
--- a/drivers/video/display/jbt6k74.c
+++ b/drivers/video/display/jbt6k74.c
@@ -1,6 +1,6 @@
 /* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
  *
- * Copyright (C) 2006-2007 by OpenMoko, Inc.
+ * Copyright (C) 2006-2007 by Openmoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>,
  * 	   Stefan Schmidt <stefan@openmoko.org>
  * All rights reserved.
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 9c98e86..cd76c1a 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -78,7 +78,7 @@ config LOGO_SUPERH_CLUT224
 	default y
 
 config LOGO_OPENMOKO_CLUT224
-	bool "224-color OpenMoko Linux logo"
+	bool "224-color Openmoko Linux logo"
 	depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
 	default y
 
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 8b044b4..bd397e1 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -117,7 +117,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 		logo = &logo_m32r_clut224;
 #endif
 #ifdef CONFIG_LOGO_OPENMOKO_CLUT224
-		/* OpenMoko Linux logo */
+		/* Openmoko Linux logo */
 		logo = &logo_openmoko_clut224;
 #endif
 	}
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
index f32cba3..dbc9c18 100644
--- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
@@ -1,7 +1,7 @@
 /*
  * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
  *
- * Copyright 2007 OpenMoko Inc
+ * Copyright 2007 Openmoko Inc
  * Author: Graeme Gregory <graeme@openmoko.org>
  * Copyright 2007 Wolfson Microelectronics PLC.
  * Author: Graeme Gregory <linux@wolfsonmicro.com>
-- 
1.5.6.3