]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
hwmon: Only include of_match_table with CONFIG_OF_GPIO
authorJamie Lentin <jm@lentin.co.uk>
Thu, 1 Nov 2012 23:55:43 +0000 (23:55 +0000)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 2 Nov 2012 00:31:20 +0000 (17:31 -0700)
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>
drivers/hwmon/gpio-fan.c

index 36509ae32083d2b3e48ec894768c504e1179577c..1381a2e3bbd4dc09dca9e74c87dd4ad2ce5ebc50 100644 (file)
@@ -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
        },
 };