diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /drivers/hwmon/ads7871.c | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'drivers/hwmon/ads7871.c')
| -rw-r--r-- | drivers/hwmon/ads7871.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/ads7871.c b/drivers/hwmon/ads7871.c index 52319340e182..04450f8bf5da 100644 --- a/drivers/hwmon/ads7871.c +++ b/drivers/hwmon/ads7871.c | |||
| @@ -227,7 +227,6 @@ static int __devexit ads7871_remove(struct spi_device *spi) | |||
| 227 | static struct spi_driver ads7871_driver = { | 227 | static struct spi_driver ads7871_driver = { |
| 228 | .driver = { | 228 | .driver = { |
| 229 | .name = DEVICE_NAME, | 229 | .name = DEVICE_NAME, |
| 230 | .bus = &spi_bus_type, | ||
| 231 | .owner = THIS_MODULE, | 230 | .owner = THIS_MODULE, |
| 232 | }, | 231 | }, |
| 233 | 232 | ||