diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 18:55:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-29 18:55:13 +0100 |
| commit | dc418f6e6a8f5021ccf9e9c0957eefae3737168d (patch) | |
| tree | 2f420c2e330f278cd889461b04b42fdff096226a /drivers/i2c/busses/i2c-bcm-kona.c | |
| parent | Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | i2c: bcm2835: Linking platform nodes to adapter nodes (diff) | |
| download | linux-dc418f6e6a8f5021ccf9e9c0957eefae3737168d.tar.xz linux-dc418f6e6a8f5021ccf9e9c0957eefae3737168d.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Some easy but needed fixes for i2c drivers since rc1"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: bcm2835: Linking platform nodes to adapter nodes
i2c: omap: raw read and write endian fix
i2c: i2c-bcm-kona: Fix module build
i2c: i2c-diolan-u2c: different usb endpoints for DLN-2-U2C
i2c: bcm-kona: remove duplicated include
i2c: davinci: raw read and write endian fix
Diffstat (limited to 'drivers/i2c/busses/i2c-bcm-kona.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-bcm-kona.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c index 036cf03aeb61..18a74a6751a9 100644 --- a/drivers/i2c/busses/i2c-bcm-kona.c +++ b/drivers/i2c/busses/i2c-bcm-kona.c @@ -20,7 +20,6 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/io.h> -#include <linux/clk.h> #include <linux/slab.h> /* Hardware register offsets and field defintions */ @@ -891,7 +890,7 @@ static const struct of_device_id bcm_kona_i2c_of_match[] = { {.compatible = "brcm,kona-i2c",}, {}, }; -MODULE_DEVICE_TABLE(of, kona_i2c_of_match); +MODULE_DEVICE_TABLE(of, bcm_kona_i2c_of_match); static struct platform_driver bcm_kona_i2c_driver = { .driver = { |