aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon/cvmx-fau.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 14:18:03 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-05 14:18:03 -0700
commite9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch)
tree8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/octeon/cvmx-fau.h
parentcdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff)
parentb12d1995f650e92f26184afd28e6cf40bf64467a (diff)
downloadkernel_samsung_espresso10-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip
kernel_samsung_espresso10-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz
kernel_samsung_espresso10-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.bz2
Staging: Merge staging-next into Linus's tree
Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/octeon/cvmx-fau.h')
-rw-r--r--drivers/staging/octeon/cvmx-fau.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/cvmx-fau.h b/drivers/staging/octeon/cvmx-fau.h
index 29bdce6..a6939fc 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.