aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c2
-rw-r--r--arch/arm/mach-s3c2410/mach-qt2410.c2
-rw-r--r--arch/arm/mach-s3c2410/pwm.c2
-rw-r--r--arch/arm/mach-s3c2440/Kconfig2
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c2
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_bt.c2
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gps.c2
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_gsm.c2
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_pm_host.c2
-rw-r--r--arch/arm/plat-s3c24xx/neo1973_version.c2
-rwxr-xr-xbuild2
-rw-r--r--drivers/i2c/chips/pcf50606.c2
-rw-r--r--drivers/i2c/chips/pcf50606.h2
-rw-r--r--drivers/i2c/chips/pcf50633.c2
-rw-r--r--drivers/i2c/chips/pcf50633.h2
-rw-r--r--drivers/input/keyboard/neo1973kbd.c2
-rw-r--r--drivers/input/keyboard/qt2410kbd.c2
-rw-r--r--drivers/input/misc/lis302dl.c2
-rw-r--r--drivers/leds/leds-neo1973-gta02.c2
-rw-r--r--drivers/leds/leds-neo1973-vibrator.c2
-rw-r--r--drivers/mfd/glamo/Kconfig2
-rw-r--r--drivers/mfd/glamo/glamo-core.c2
-rw-r--r--drivers/mfd/glamo/glamo-fb.c4
-rw-r--r--drivers/mfd/glamo/glamo-lcm-spi.c2
-rw-r--r--drivers/mfd/glamo/glamo-mci.c4
-rw-r--r--drivers/mfd/glamo/glamo-mci.h2
-rw-r--r--drivers/mfd/glamo/glamo-regs.h2
-rw-r--r--drivers/mfd/glamo/glamo-spi-gpio.c2
-rw-r--r--drivers/power/gta02_hdq.c2
-rw-r--r--drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c2
-rw-r--r--drivers/video/backlight/gta01_bl.c2
-rw-r--r--drivers/video/display/Kconfig2
-rw-r--r--drivers/video/display/jbt6k74.c2
-rw-r--r--drivers/video/logo/Kconfig2
-rw-r--r--drivers/video/logo/logo.c2
-rw-r--r--sound/soc/s3c24xx/neo1973_gta02_wm8753.c2
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 0543daa937b..8c1a4026660 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 a6f92e9ae6a..749dcd7a868 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 8a07359892b..23738c1482a 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 cbcf9fc37c1..c914eebec40 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -98,7 +98,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 bd2888ae47f..f9e00d5194e 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 8f5be88f947..a9694b4c1c4 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 b12f7bca9dd..d882f7b0231 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 c3292b88433..f22cad859a7 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 4eae3419968..8aee6096649 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 ad41a0f77b2..ab4805b741d 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 7e61ea2defa..5bd3d2da7dc 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 03805be56f3..6f71e6ccc19 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 15b350f0dc6..5eded9616a0 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 b5cd2cbb005..09d5cfdd1e8 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 9aad2062560..93dfd999e68 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 6c96660f079..a1fc7a372ad 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 4d497a3454c..fa4bf32fac0 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 2be816a2ebb..6067dba75d5 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 bf1d5407025..8678670621b 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 36ed216a504..f31302d2ca9 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 ec2ae3d27b5..86a7c40a0cf 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 ab906901536..a6b977b41f6 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 8633e444cb6..edc6d9c3086 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 92cabe4dbb0..874fb0e8c13 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 d8847c5ddca..05bbfc4b346 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 55852e7ed46..f3f170eb6c0 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 8f6c45cbc42..32411e37f86 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 eda73223723..ece575022c9 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 12c742e29f6..5a79fd6ac95 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 3c4758b419e..8c3bbbc4922 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 c2bf0c99ef9..bd7d41f5568 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 f0da4834e2d..674dc2c50fe 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 d7e94421ae2..7e11da7b47d 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 9c98e86c384..cd76c1a3b6e 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 8b044b46293..bd397e196a6 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 f32cba319cd..dbc9c189e77 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>