diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 11:41:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 11:41:17 -0700 |
| commit | cc41f5cede3c63836d1c0958204630b07f5b5ee7 (patch) | |
| tree | dfd94451c919b5185d8a01fd3e5a90244fb0de1c /drivers/staging/octeon/cvmx-fau.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (diff) | |
| parent | Staging: wlan-ng: Update prism2_set_tx_power() to use mBm (diff) | |
| download | linux-dev-cc41f5cede3c63836d1c0958204630b07f5b5ee7.tar.xz linux-dev-cc41f5cede3c63836d1c0958204630b07f5b5ee7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (524 commits)
Staging: wlan-ng: Update prism2_set_tx_power() to use mBm
Staging: ti-st: update TODO
Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name format
Staging: comedi : fix brace coding style issue in wwrap.c
Staging: quatech_usb2: remove unused qt2_box_flush function
Staging: slicoss: Remove net_device_stats from the driver's private
staging: rtl8192su: check whether requests succeeded
staging: panel: fix error path
staging: otus: check kmalloc() return value
staging: octeon: check request_irq() return value
Staging: wlan-ng: remove typedef in p80211hdr.h
Staging: wlan-ng: fix checkpatch issues in headers.
Staging: wlan-ng: remove typedef in p80211ioctl.h
Staging: wlan-ng: fix style issues in p80211conv.h
Staging: wlan-ng: fix style issues for p80211hdr.h
staging: vt6656: removed NTSTATUS definition
staging: vt6656: simplified tests involving both multi/broad-casts
Staging: vt6655: replace BOOL with in kernel bool
Staging: vt6655: replace FALSE with in kernel false
Staging: vt6655: replace TRUE with in kernel true
...
Diffstat (limited to 'drivers/staging/octeon/cvmx-fau.h')
| -rw-r--r-- | drivers/staging/octeon/cvmx-fau.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/cvmx-fau.h b/drivers/staging/octeon/cvmx-fau.h index 29bdce66cdf8..a6939fc8ba18 100644 --- a/drivers/staging/octeon/cvmx-fau.h +++ b/drivers/staging/octeon/cvmx-fau.h @@ -299,7 +299,7 @@ cvmx_fau_tagwait_fetch_and_add8(cvmx_fau_reg_8_t reg, int8_t value) /** * Builds I/O data for async operations * - * @scraddr: Scratch pad byte addres to write to. Must be 8 byte aligned + * @scraddr: Scratch pad byte address to write to. Must be 8 byte aligned * @value: Signed value to add. * Note: When performing 32 and 64 bit access, only the low * 22 bits are available. |