diff options
| author | Jamie Lentin <jm@lentin.co.uk> | 2012-11-01 23:55:43 +0000 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-11-01 17:31:20 -0700 |
| commit | eaa7cc60f7dff5e74ef387ace8228235fab8241b (patch) | |
| tree | 4f590582b3bf8dcab75507810b9996aa1499522f /drivers/hwmon | |
| parent | d034fbf08b6fe86271d0d0bd332edabeb5749fd6 (diff) | |
| download | linux-3.10-eaa7cc60f7dff5e74ef387ace8228235fab8241b.tar.gz linux-3.10-eaa7cc60f7dff5e74ef387ace8228235fab8241b.tar.bz2 linux-3.10-eaa7cc60f7dff5e74ef387ace8228235fab8241b.zip | |
hwmon: Only include of_match_table with CONFIG_OF_GPIO
The following fixes build errors on sparc. Without any DT support,
of_match_ptr is NULL and the below is a no-op. However, if just
CONFIG_OF is defined then so is of_match_ptr.
All useful parts of the gpio-fan DT support rely on CONFIG_OF_GPIO
anyway, so of_match_table should too.
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/gpio-fan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index 36509ae3208..1381a2e3bbd 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c @@ -630,7 +630,9 @@ static struct platform_driver gpio_fan_driver = { .driver = { .name = "gpio-fan", .pm = GPIO_FAN_PM, +#ifdef CONFIG_OF_GPIO .of_match_table = of_match_ptr(of_gpio_fan_match), +#endif }, }; |