diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-05-09 03:49:00 -0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-05-22 17:14:58 -0400 |
| commit | 0ae5fb6fd346cf368639fb6256db6af0831b0048 (patch) | |
| tree | eb360406b1cbd277b3860b28caa6a249b3d567f1 /drivers/iio/dac | |
| parent | 3b813798aa7030f1beef638c75f8b0008f737a82 (diff) | |
iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
This patch fixes below build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m:
drivers/built-in.o: In function `ad5064_i2c_write':
drivers/iio/dac/ad5064.c:608: undefined reference to `i2c_master_send'
drivers/built-in.o: In function `ad5064_i2c_register_driver':
drivers/iio/dac/ad5064.c:646: undefined reference to `i2c_register_driver'
drivers/built-in.o: In function `ad5064_i2c_unregister_driver':
drivers/iio/dac/ad5064.c:651: undefined reference to `i2c_del_driver'
make: *** [vmlinux] Error 1
When CONFIG_I2C=m, meaning we can't build the drivers in with I2C support.
Thus don't allow the drivers to be compiled as built-in when CONFIG_I2C=m.
The real fix though is to break the driver apart into a SPI part, an I2C part
and a common part. But that's something for 3.11 while this is something for
3.10/stable.
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/dac')
| -rw-r--r-- | drivers/iio/dac/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig index f4a6f0838327..b61160bd935e 100644 --- a/drivers/iio/dac/Kconfig +++ b/drivers/iio/dac/Kconfig | |||
| @@ -5,7 +5,7 @@ menu "Digital to analog converters" | |||
| 5 | 5 | ||
| 6 | config AD5064 | 6 | config AD5064 |
| 7 | tristate "Analog Devices AD5064 and similar multi-channel DAC driver" | 7 | tristate "Analog Devices AD5064 and similar multi-channel DAC driver" |
| 8 | depends on (SPI_MASTER || I2C) | 8 | depends on (SPI_MASTER && I2C!=m) || I2C |
| 9 | help | 9 | help |
| 10 | Say yes here to build support for Analog Devices AD5024, AD5025, AD5044, | 10 | Say yes here to build support for Analog Devices AD5024, AD5025, AD5044, |
| 11 | AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668, | 11 | AD5045, AD5064, AD5064-1, AD5065, AD5628, AD5629R, AD5648, AD5666, AD5668, |
| @@ -27,7 +27,7 @@ config AD5360 | |||
| 27 | 27 | ||
| 28 | config AD5380 | 28 | config AD5380 |
| 29 | tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver" | 29 | tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver" |
| 30 | depends on (SPI_MASTER || I2C) | 30 | depends on (SPI_MASTER && I2C!=m) || I2C |
| 31 | select REGMAP_I2C if I2C | 31 | select REGMAP_I2C if I2C |
| 32 | select REGMAP_SPI if SPI_MASTER | 32 | select REGMAP_SPI if SPI_MASTER |
| 33 | help | 33 | help |
| @@ -57,7 +57,7 @@ config AD5624R_SPI | |||
| 57 | 57 | ||
| 58 | config AD5446 | 58 | config AD5446 |
| 59 | tristate "Analog Devices AD5446 and similar single channel DACs driver" | 59 | tristate "Analog Devices AD5446 and similar single channel DACs driver" |
| 60 | depends on (SPI_MASTER || I2C) | 60 | depends on (SPI_MASTER && I2C!=m) || I2C |
| 61 | help | 61 | help |
| 62 | Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, | 62 | Say yes here to build support for Analog Devices AD5300, AD5301, AD5310, |
| 63 | AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453, | 63 | AD5311, AD5320, AD5321, AD5444, AD5446, AD5450, AD5451, AD5452, AD5453, |