diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/spi | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spidev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 5d23983f02fc..d9b4100ade9c 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | * This supports acccess to SPI devices using normal userspace I/O calls. | 42 | * This supports acccess to SPI devices using normal userspace I/O calls. |
| 43 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, | 43 | * Note that while traditional UNIX/POSIX I/O semantics are half duplex, |
| 44 | * and often mask message boundaries, full SPI support requires full duplex | 44 | * and often mask message boundaries, full SPI support requires full duplex |
| 45 | * transfers. There are several kinds of of internal message boundaries to | 45 | * transfers. There are several kinds of internal message boundaries to |
| 46 | * handle chipselect management and other protocol options. | 46 | * handle chipselect management and other protocol options. |
| 47 | * | 47 | * |
| 48 | * SPI has a character major number assigned. We allocate minor numbers | 48 | * SPI has a character major number assigned. We allocate minor numbers |