releases/upstream/2.6.30-rc1/0001-trivial-Fix-misspelling-of-firmware.patch

   1 From 877d03105d04b2c13e241130277fa69c8d2564f0 Mon Sep 17 00:00:00 2001
   2 From: Nick Andrew <nick@nick-andrew.net>
   3 Date: Mon, 26 Jan 2009 11:06:57 +0100
   4 Subject: trivial: Fix misspelling of firmware
   5
   6 Fix misspelling of firmware.
   7
   8 Signed-off-by: Nick Andrew <nick@nick-andrew.net>
   9 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  10 ---
  11  Documentation/ia64/kvm.txt                         |    2 +-
  12  .../dts-bindings/fsl/cpm_qe/qe/firmware.txt        |    2 +-
  13  arch/mips/sgi-ip27/ip27-smp.c                      |    2 +-
  14  arch/sparc/kernel/head_64.S                        |    2 +-
  15  drivers/net/sb1250-mac.c                           |    2 +-
  16  drivers/net/tg3.c                                  |    2 +-
  17  drivers/net/wireless/ipw2x00/ipw2100.c             |    2 +-
  18  drivers/net/wireless/ipw2x00/ipw2200.c             |    2 +-
  19  drivers/net/wireless/iwlwifi/iwl-agn.c             |    2 +-
  20  drivers/net/wireless/iwlwifi/iwl3945-base.c        |    2 +-
  21  drivers/net/wireless/libertas/cmd.c                |    2 +-
  22  drivers/pci/pci.c                                  |    2 +-
  23  drivers/platform/x86/thinkpad_acpi.c               |    2 +-
  24  drivers/staging/otus/hal/hpmain.c                  |    2 +-
  25  drivers/usb/atm/ueagle-atm.c                       |    2 +-
  26  drivers/usb/serial/ChangeLog.history               |    2 +-
  27  include/linux/libata.h                             |    2 +-
  28  kernel/power/disk.c                                |    4 ++--
  29  sound/oss/pss.c                                    |    2 +-
  30  sound/sh/aica.c                                    |    2 +-
  31  20 files changed, 21 insertions(+), 21 deletions(-)
  32
  33 diff --git a/Documentation/ia64/kvm.txt b/Documentation/ia64/kvm.txt
  34 index 84f7cb3..ffb5c80 100644
  35 --- a/Documentation/ia64/kvm.txt
  36 +++ b/Documentation/ia64/kvm.txt
  37 @@ -42,7 +42,7 @@ Note: For step 2, please make sure that host page size == TARGET_PAGE_SIZE of qe
  38                 hg clone http://xenbits.xensource.com/ext/efi-vfirmware.hg
  39             you can get the firmware's binary in the directory of efi-vfirmware.hg/binaries.
  40
  41 -       (3) Rename the firware you owned to Flash.fd, and copy it to /usr/local/share/qemu
  42 +       (3) Rename the firmware you owned to Flash.fd, and copy it to /usr/local/share/qemu
  43
  44  4. Boot up Linux or Windows guests:
  45         4.1 Create or install a image for guest boot. If you have xen experience, it should be easy.
  46 diff --git a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
  47 index 6c238f5..249db3a 100644
  48 --- a/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
  49 +++ b/Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe/firmware.txt
  50 @@ -1,6 +1,6 @@
  51  * Uploaded QE firmware
  52
  53 -      If a new firwmare has been uploaded to the QE (usually by the
  54 +      If a new firmware has been uploaded to the QE (usually by the
  55        boot loader), then a 'firmware' child node should be added to the QE
  56        node.  This node provides information on the uploaded firmware that
  57        device drivers may need.
  58 diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
  59 index 5b47d6b..cbcd7eb 100644
  60 --- a/arch/mips/sgi-ip27/ip27-smp.c
  61 +++ b/arch/mips/sgi-ip27/ip27-smp.c
  62 @@ -221,7 +221,7 @@ static void __init ip27_smp_setup(void)
  63          * Assumption to be fixed: we're always booted on logical / physical
  64          * processor 0.  While we're always running on logical processor 0
  65          * this still means this is physical processor zero; it might for
  66 -        * example be disabled in the firwware.
  67 +        * example be disabled in the firmware.
  68          */
  69         alloc_cpupda(0, 0);
  70  }
  71 diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
  72 index a46c3a2..3a1b7bf 100644
  73 --- a/arch/sparc/kernel/head_64.S
  74 +++ b/arch/sparc/kernel/head_64.S
  75 @@ -686,7 +686,7 @@ tlb_fixup_done:
  76          * point.
  77          *
  78          * There used to be enormous complexity wrt. transferring
  79 -        * over from the firwmare's trap table to the Linux kernel's.
  80 +        * over from the firmware's trap table to the Linux kernel's.
  81          * For example, there was a chicken & egg problem wrt. building
  82          * the OBP page tables, yet needing to be on the Linux kernel
  83          * trap table (to translate PAGE_OFFSET addresses) in order to
  84 diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
  85 index 88dd2e0..ce7551e 100644
  86 --- a/drivers/net/sb1250-mac.c
  87 +++ b/drivers/net/sb1250-mac.c
  88 @@ -2299,7 +2299,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)
  89         eaddr = sc->sbm_hwaddr;
  90
  91         /*
  92 -        * Read the ethernet address.  The firwmare left this programmed
  93 +        * Read the ethernet address.  The firmware left this programmed
  94          * for us in the ethernet address register for each mac.
  95          */
  96
  97 diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
  98 index f7efcec..ed60b18 100644
  99 --- a/drivers/net/tg3.c
 100 +++ b/drivers/net/tg3.c
 101 @@ -11225,7 +11225,7 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
 102                 return tg3_phy_init(tp);
 103
 104         /* Reading the PHY ID register can conflict with ASF
 105 -        * firwmare access to the PHY hardware.
 106 +        * firmware access to the PHY hardware.
 107          */
 108         err = 0;
 109         if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||
 110 diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
 111 index 115b704..f4e963b 100644
 112 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 113 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
 114 @@ -2362,7 +2362,7 @@ static void ipw2100_corruption_detected(struct ipw2100_priv *priv, int i)
 115                        i * sizeof(struct ipw2100_status));
 116
 117  #ifdef IPW2100_DEBUG_C3
 118 -       /* Halt the fimrware so we can get a good image */
 119 +       /* Halt the firmware so we can get a good image */
 120         write_register(priv->net_dev, IPW_REG_RESET_REG,
 121                        IPW_AUX_HOST_RESET_REG_STOP_MASTER);
 122         j = 5;
 123 diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
 124 index b344994..f6174fd 100644
 125 --- a/drivers/net/wireless/ipw2x00/ipw2200.c
 126 +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
 127 @@ -8844,7 +8844,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
 128  #endif                         /* CONFIG_IPW2200_MONITOR */
 129
 130         /* Free the existing firmware and reset the fw_loaded
 131 -        * flag so ipw_load() will bring in the new firmawre */
 132 +        * flag so ipw_load() will bring in the new firmware */
 133         free_firmware();
 134
 135         priv->ieee->iw_mode = wrqu->mode;
 136 diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
 137 index 663dc83..3889158 100644
 138 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
 139 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
 140 @@ -1337,7 +1337,7 @@ static int iwl_read_ucode(struct iwl_priv *priv)
 141
 142         /* api_ver should match the api version forming part of the
 143          * firmware filename ... but we don't check for that and only rely
 144 -        * on the API version read from firware header from here on forward */
 145 +        * on the API version read from firmware header from here on forward */
 146
 147         if (api_ver < api_min || api_ver > api_max) {
 148                 IWL_ERR(priv, "Driver unable to support your firmware API. "
 149 diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
 150 index a71b08c..9d5f97d 100644
 151 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
 152 +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
 153 @@ -2562,7 +2562,7 @@ static int iwl3945_read_ucode(struct iwl_priv *priv)
 154
 155         /* api_ver should match the api version forming part of the
 156          * firmware filename ... but we don't check for that and only rely
 157 -        * on the API version read from firware header from here on forward */
 158 +        * on the API version read from firmware header from here on forward */
 159
 160         if (api_ver < api_min || api_ver > api_max) {
 161                 IWL_ERR(priv, "Driver unable to support your firmware API. "
 162 diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
 163 index 639dd02..8c3605c 100644
 164 --- a/drivers/net/wireless/libertas/cmd.c
 165 +++ b/drivers/net/wireless/libertas/cmd.c
 166 @@ -1649,7 +1649,7 @@ static struct cmd_ctrl_node *lbs_get_cmd_ctrl_node(struct lbs_private *priv)
 167
 168  /**
 169   *  @brief This function executes next command in command
 170 - *  pending queue. It will put fimware back to PS mode
 171 + *  pending queue. It will put firmware back to PS mode
 172   *  if applicable.
 173   *
 174   *  @param priv     A pointer to struct lbs_private structure
 175 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
 176 index 6d61200..dab33a2 100644
 177 --- a/drivers/pci/pci.c
 178 +++ b/drivers/pci/pci.c
 179 @@ -550,7 +550,7 @@ void pci_update_current_state(struct pci_dev *dev, pci_power_t state)
 180   * @dev: PCI device to handle.
 181   * @state: PCI power state (D0, D1, D2, D3hot) to put the device into.
 182   *
 183 - * Transition a device to a new power state, using the platform formware and/or
 184 + * Transition a device to a new power state, using the platform firmware and/or
 185   * the device's PCI PM registers.
 186   *
 187   * RETURN VALUE:
 188 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
 189 index d243320..814cb65 100644
 190 --- a/drivers/platform/x86/thinkpad_acpi.c
 191 +++ b/drivers/platform/x86/thinkpad_acpi.c
 192 @@ -5811,7 +5811,7 @@ static struct ibm_struct volume_driver_data = {
 193   *     ThinkPads from this same time period (and earlier) probably lack the
 194   *     tachometer as well.
 195   *
 196 - *     Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
 197 + *     Unfortunately a lot of ThinkPads with new-style ECs but whose firmware
 198   *     was never fixed by IBM to report the EC firmware version string
 199   *     probably support the tachometer (like the early X models), so
 200   *     detecting it is quite hard.  We need more data to know for sure.
 201 diff --git a/drivers/staging/otus/hal/hpmain.c b/drivers/staging/otus/hal/hpmain.c
 202 index 2e65c46..dab2783 100644
 203 --- a/drivers/staging/otus/hal/hpmain.c
 204 +++ b/drivers/staging/otus/hal/hpmain.c
 205 @@ -152,7 +152,7 @@ u16_t zfHpInit(zdev_t* dev, u32_t frequency)
 206      else
 207      {
 208      #ifndef ZM_OTUS_LINUX_PHASE_2
 209 -        /* donwload the normal frimware */
 210 +        /* download the normal firmware */
 211          if ((ret = zfFirmwareDownload(dev, (u32_t*)zcFwImage,
 212                  (u32_t)zcFwImageSize, ZM_FIRMWARE_WLAN_ADDR)) != ZM_SUCCESS)
 213          {
 214 diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
 215 index b6483dd..9cf9ff6 100644
 216 --- a/drivers/usb/atm/ueagle-atm.c
 217 +++ b/drivers/usb/atm/ueagle-atm.c
 218 @@ -626,7 +626,7 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *conte
 219                 goto err_fw_corrupted;
 220
 221         /*
 222 -        * Start to upload formware : send reset
 223 +        * Start to upload firmware : send reset
 224          */
 225         value = 1;
 226         ret = uea_send_modem_cmd(usb, F8051_USBCS, sizeof(value), &value);
 227 diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
 228 index c1b2799..f13fd48 100644
 229 --- a/drivers/usb/serial/ChangeLog.history
 230 +++ b/drivers/usb/serial/ChangeLog.history
 231 @@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
 232
 233   0.2 (01/30/2000) greg kroah-hartman
 234         Milestone 1 release.
 235 -       Device is found by USB subsystem, enumerated, fimware is downloaded
 236 +       Device is found by USB subsystem, enumerated, firmware is downloaded
 237         and the descriptors are printed to the debug log, config is set, and
 238         green light starts to blink. Open port works, and data can be sent
 239         and received at the default settings of the UART. Loopback connector
 240 diff --git a/include/linux/libata.h b/include/linux/libata.h
 241 index 76262d8..b450a26 100644
 242 --- a/include/linux/libata.h
 243 +++ b/include/linux/libata.h
 244 @@ -379,7 +379,7 @@ enum {
 245         ATA_HORKAGE_BRIDGE_OK   = (1 << 10),    /* no bridge limits */
 246         ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
 247                                                     not multiple of 16 bytes */
 248 -       ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firwmare update warning */
 249 +       ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firmware update warning */
 250         ATA_HORKAGE_1_5_GBPS    = (1 << 13),    /* force 1.5 Gbps */
 251
 252          /* DMA mask for user DMA control: User visible values; DO NOT
 253 diff --git a/kernel/power/disk.c b/kernel/power/disk.c
 254 index 4a4a206..9d1c1a0 100644
 255 --- a/kernel/power/disk.c
 256 +++ b/kernel/power/disk.c
 257 @@ -265,7 +265,7 @@ static int create_image(int platform_mode)
 258   *     hibernation_snapshot - quiesce devices and create the hibernation
 259   *     snapshot image.
 260   *     @platform_mode - if set, use the platform driver, if available, to
 261 - *                      prepare the platform frimware for the power transition.
 262 + *                      prepare the platform firmware for the power transition.
 263   *
 264   *     Must be called with pm_mutex held
 265   */
 266 @@ -378,7 +378,7 @@ static int resume_target_kernel(void)
 267   *     hibernation_restore - quiesce devices and restore the hibernation
 268   *     snapshot image.  If successful, control returns in hibernation_snaphot()
 269   *     @platform_mode - if set, use the platform driver, if available, to
 270 - *                      prepare the platform frimware for the transition.
 271 + *                      prepare the platform firmware for the transition.
 272   *
 273   *     Must be called with pm_mutex held
 274   */
 275 diff --git a/sound/oss/pss.c b/sound/oss/pss.c
 276 index 16517a5..83f5ee2 100644
 277 --- a/sound/oss/pss.c
 278 +++ b/sound/oss/pss.c
 279 @@ -46,7 +46,7 @@
 280   *          load the driver as it did in previous versions.
 281   * 04-07-1999: Anthony Barbachan <barbcode@xmen.cis.fordham.edu>
 282   *          Added module parameter pss_firmware to allow the user to tell
 283 - *          the driver where the fireware file is located.  The default
 284 + *          the driver where the firmware file is located.  The default
 285   *          setting is the previous hardcoded setting "/etc/sound/pss_synth".
 286   * 00-03-03: Christoph Hellwig <chhellwig@infradead.org>
 287   *         Adapted to module_init/module_exit
 288 diff --git a/sound/sh/aica.c b/sound/sh/aica.c
 289 index f551233..583a369 100644
 290 --- a/sound/sh/aica.c
 291 +++ b/sound/sh/aica.c
 292 @@ -565,7 +565,7 @@ static int load_aica_firmware(void)
 293         err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev);
 294         if (unlikely(err))
 295                 return err;
 296 -       /* write firware into memory */
 297 +       /* write firmware into memory */
 298         spu_disable();
 299         spu_memload(0, fw_entry->data, fw_entry->size);
 300         spu_enable();
 301 --
 302 1.6.2.1
 303