diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/macintosh | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/macintosh/Makefile | 1 | ||||
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/rack-meter.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/smu.c | 1 | ||||
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
6 files changed, 0 insertions, 9 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index d26a312..696238b 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -103,7 +103,6 @@ config ADB_PMU_LED_IDE bool "Use front LED as IDE LED by default" depends on ADB_PMU_LED depends on LEDS_CLASS - depends on IDE_GD_ATA select LEDS_TRIGGERS select LEDS_TRIGGER_IDE_DISK help diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index d2f0120..6753b65 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile @@ -40,7 +40,6 @@ obj-$(CONFIG_WINDFARM_RM31) += windfarm_fcu_controls.o \ windfarm_ad7417_sensor.o \ windfarm_lm75_sensor.o \ windfarm_lm87_sensor.o \ - windfarm_max6690_sensor.o \ windfarm_pid.o \ windfarm_cpufreq_clamp.o \ windfarm_rm31.o diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 4f12c6f..ac5c879 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -24,8 +24,6 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <asm/machdep.h> #include <asm/macio.h> diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 4192901..cad0e19 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -25,8 +25,6 @@ #include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/kernel_stat.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <asm/io.h> #include <asm/prom.h> diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 23b4a3b..b3b2d36 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -35,7 +35,6 @@ #include <linux/poll.h> #include <linux/mutex.h> #include <linux/of_device.h> -#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/slab.h> diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index dee88e5..283e1b5 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -46,8 +46,6 @@ #include <linux/suspend.h> #include <linux/cpu.h> #include <linux/compat.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <asm/prom.h> #include <asm/machdep.h> #include <asm/io.h> |