openwrt-owl/target/linux/s3c24xx/patches-2.6.24/1124-OpenMoko-Openmoko.patch

From f761294475ddac8ecb74b5ef6c7cb7b0e7f71e0b Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Sun, 13 Apr 2008 07:25:57 +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/mach-s3c2440/mach-hxd8.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 +-
 37 files changed, 39 insertions(+), 39 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 71719ac..c40aaca 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -96,7 +96,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/mach-s3c2440/mach-hxd8.c b/arch/arm/mach-s3c2440/mach-hxd8.c
index 3400ed3..6690931 100644
--- a/arch/arm/mach-s3c2440/mach-hxd8.c
+++ b/arch/arm/mach-s3c2440/mach-hxd8.c
@@ -2,7 +2,7 @@
  *
  * S3C2440 Machine Support for the FIC HXD8
  *
- * Copyright (c) 2007 OpenMoko, Inc.
+ * Copyright (c) 2007 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 728454d..12e06bf 100755
--- a/build
+++ b/build
@@ -7,7 +7,7 @@ make -f synthesize-gta-module-configs.mak
 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 19ca363..34b2a01 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 6d97d00..def3167 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -68,7 +68,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 541fd97..4f026f8 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -107,7 +107,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.5