diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-04-04 06:08:25 -0400 |
|---|---|---|
| committer | Steven Miao <realmz6@gmail.com> | 2014-04-11 20:47:58 -0400 |
| commit | e3dd192956b17aed83f19487aa4caa009ad15006 (patch) | |
| tree | 43b3865813298eceed29fde53c0293bf28c84923 | |
| parent | 6ffe34638e54d792e3d58633008891c2f3619d64 (diff) | |
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 = { | |||
| 682 | }; | 682 | }; |
| 683 | #endif | 683 | #endif |
| 684 | 684 | ||
| 685 | #if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE) | 685 | #if IS_ENABLED(CONFIG_SENSORS_AD7314) |
| 686 | static struct bfin5xx_spi_chip ad7314_spi_chip_info = { | 686 | static struct bfin5xx_spi_chip ad7314_spi_chip_info = { |
| 687 | .enable_dma = 0, | 687 | .enable_dma = 0, |
| 688 | }; | 688 | }; |
| @@ -1040,7 +1040,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 1040 | }, | 1040 | }, |
| 1041 | #endif | 1041 | #endif |
| 1042 | 1042 | ||
| 1043 | #if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE) | 1043 | #if IS_ENABLED(CONFIG_SENSORS_AD7314) |
| 1044 | { | 1044 | { |
| 1045 | .modalias = "ad7314", | 1045 | .modalias = "ad7314", |
| 1046 | .max_speed_hz = 1000000, | 1046 | .max_speed_hz = 1000000, |