Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / Documentation / networking / caif / spi_porting.txt

diff --git a/Documentation/networking/caif/spi_porting.txt b/Documentation/networking/caif/spi_porting.txt
index 61d7c9247453e54693375d70b853d35541b3abb6..0cb8cb9098f4c3f6be0589ab19a3109b6754070a 100644 (file)
--- a/Documentation/networking/caif/spi_porting.txt
+++ b/Documentation/networking/caif/spi_porting.txt
@@ -32,7 +32,7 @@ the physical hardware, both with regard to SPI and to GPIOs.
        This function is called by the CAIF SPI interface to give
        you a chance to set up your hardware to be ready to receive
        a stream of data from the master. The xfer structure contains
-       both physical and logical adresses, as well as the total length
+       both physical and logical addresses, as well as the total length
        of the transfer in both directions.The dev parameter can be used
        to map to different CAIF SPI slave devices.