diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-04-04 12:08:25 +0200 |
|---|---|---|
| committer | Steven Miao <realmz6@gmail.com> | 2014-04-12 08:47:58 +0800 |
| commit | e3dd192956b17aed83f19487aa4caa009ad15006 (patch) | |
| tree | 43b3865813298eceed29fde53c0293bf28c84923 | |
| parent | 6ffe34638e54d792e3d58633008891c2f3619d64 (diff) | |
| download | linux-e3dd192956b17aed83f19487aa4caa009ad15006.tar.bz2 | |
Blackfin: bf537: rename "CONFIG_AD7314"
In v3.2 the Analog Devices AD7314 temperature sensor driver was removed
as an IIO driver and added as a HWMON driver. But it was apparently
overlooked to rename two references to CONFIG_AD7314 to
CONFIG_SENSORS_AD7314. Do so now. Use the IS_ENABLED() macro, while
we're at it.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 60ce59891495..de2187f40f02 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -682,7 +682,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = { }; #endif -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE) +#if IS_ENABLED(CONFIG_SENSORS_AD7314) static struct bfin5xx_spi_chip ad7314_spi_chip_info = { .enable_dma = 0, }; @@ -1040,7 +1040,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { }, #endif -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE) +#if IS_ENABLED(CONFIG_SENSORS_AD7314) { .modalias = "ad7314", .max_speed_hz = 1000000, |