diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 22:04:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 22:04:09 -0500 |
commit | 8e128ce3318a147903c893de1891f6c2306f8a61 (patch) | |
tree | 3b45e780570e9beb9ec8e83c677f2d9fd9b458ce /drivers/mfd/wm8350-i2c.c | |
parent | 0bbb2753584231db364b624bf8cf82551b94da7d (diff) | |
parent | 3f874b6643e189d3d07618928ceed0013d71593e (diff) |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
mfd: Fix section mismatch in da903x
mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
mfd: dm355evm msp430 driver
mfd: Add missing break from wm3850-core
mfd: Add WM8351 support
mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
mfd: Handle missing WM8350 platform data
mfd: Add WM8352 support
mfd: Use irq_to_desc in twl4030 code
power_supply: Add Dialog DA9030 battery charger driver
mfd: Dialog DA9030 battery charger MFD driver
mfd: Register WM8400 codec device
mfd: Pass driver_data onto child devices
mfd: Fix twl4030-core.c build error
mfd: twl4030 regulator bug fixes
mfd: twl4030: create some regulator devices
mfd: twl4030: cleanup symbols and OMAP dependency
mfd: twl4030: simplified child creation code
power_supply: Add battery health reporting for WM8350
...
Diffstat (limited to 'drivers/mfd/wm8350-i2c.c')
-rw-r--r-- | drivers/mfd/wm8350-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c index 3e0ce0e50ea2..8d8c93217572 100644 --- a/drivers/mfd/wm8350-i2c.c +++ b/drivers/mfd/wm8350-i2c.c | |||
@@ -1,8 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * wm8350-i2c.c -- Generic I2C driver for Wolfson WM8350 PMIC | 2 | * wm8350-i2c.c -- Generic I2C driver for Wolfson WM8350 PMIC |
3 | * | 3 | * |
4 | * This driver defines and configures the WM8350 for the Freescale i.MX32ADS. | ||
5 | * | ||
6 | * Copyright 2007, 2008 Wolfson Microelectronics PLC. | 4 | * Copyright 2007, 2008 Wolfson Microelectronics PLC. |
7 | * | 5 | * |
8 | * Author: Liam Girdwood | 6 | * Author: Liam Girdwood |
@@ -99,6 +97,8 @@ static int wm8350_i2c_remove(struct i2c_client *i2c) | |||
99 | 97 | ||
100 | static const struct i2c_device_id wm8350_i2c_id[] = { | 98 | static const struct i2c_device_id wm8350_i2c_id[] = { |
101 | { "wm8350", 0 }, | 99 | { "wm8350", 0 }, |
100 | { "wm8351", 0 }, | ||
101 | { "wm8352", 0 }, | ||
102 | { } | 102 | { } |
103 | }; | 103 | }; |
104 | MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id); | 104 | MODULE_DEVICE_TABLE(i2c, wm8350_i2c_id); |