diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 19:07:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 19:07:10 -0700 |
| commit | 06d2e7812ecd1b585c5e9e7bda8ee90acebaef8c (patch) | |
| tree | 2221916f69f4f485c8dd0353e5e83c9587dcc968 /include | |
| parent | 7d8eb50290e4edf8de36973728862f73ff0b94bc (diff) | |
| parent | 72a71f869c95dc11b73f09fe18c593d4a0618c3f (diff) | |
| download | linux-06d2e7812ecd1b585c5e9e7bda8ee90acebaef8c.tar.bz2 | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull more i2c updates from Wolfram Sang:
"Here is the second pull request from I2C for this merge window:
- one new feature (which nearly fell through the cracks): i2c-dev
does now use the cdev API so it can handle >256 minors. Seems
people do need that.
- two fixes for the just added DMA feature for i2c-rcar
- some typo fixes"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: dev: don't start function name with 'return'
i2c: dev: switch from register_chrdev to cdev API
i2c: xlr: rename ARCH_TANGOX to ARCH_TANGO
i2c: at91: change log when dma configuration fails
misc: at24: Fix typo in at24 header file
i2c: rcar: should depend on HAS_DMA
i2c: rcar: use dma_request_chan()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/at24.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/at24.h b/include/linux/platform_data/at24.h index dc9a13e5acda..be830b141d83 100644 --- a/include/linux/platform_data/at24.h +++ b/include/linux/platform_data/at24.h @@ -26,7 +26,7 @@ * * An example in pseudo code for a setup() callback: * - * void get_mac_addr(struct mvmem_device *nvmem, void *context) + * void get_mac_addr(struct nvmem_device *nvmem, void *context) * { * u8 *mac_addr = ethernet_pdata->mac_addr; * off_t offset = context; |