diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 11:57:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 11:57:54 -0700 |
| commit | d0a0c28cf178943afaf22f87957b73c47497cb4b (patch) | |
| tree | c07ee70a42bdf046d0ce8540b4e86d2c16f05b6c /drivers/i2c/busses/i2c-pxa.c | |
| parent | ce00f7feb0a497b4280e1efe16e03728ed292687 (diff) | |
| parent | f6e1901c4c596238abe6735bb20593f2734f757e (diff) | |
| download | kernel_samsung_smdk4412-d0a0c28cf178943afaf22f87957b73c47497cb4b.zip kernel_samsung_smdk4412-d0a0c28cf178943afaf22f87957b73c47497cb4b.tar.gz kernel_samsung_smdk4412-d0a0c28cf178943afaf22f87957b73c47497cb4b.tar.bz2 | |
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux:
i2c/nuc900: add i2c driver support for nuc900
i2c: Enable NXP LPC support in Kconfig
i2c-pxa: fix compiler warning, due to missing const
i2c: davinci: bus recovery procedure to clear the bus
i2c: davinci: Add cpufreq support
i2c: davinci: Add suspend/resume support
i2c: davinci: Add helper functions for power management
i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage
i2c: davinci: Fix smbus Oops with AIC33 usage
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 020ff23..c94e51b 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1001,7 +1001,7 @@ static int i2c_pxa_probe(struct platform_device *dev) struct pxa_i2c *i2c; struct resource *res; struct i2c_pxa_platform_data *plat = dev->dev.platform_data; - struct platform_device_id *id = platform_get_device_id(dev); + const struct platform_device_id *id = platform_get_device_id(dev); int ret; int irq; |