target/linux/s3c24xx/patches-2.6.26/1112-OpenMoko-Openmoko.patch

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