diff options
| author | Eric Paris <eparis@redhat.com> | 2014-03-07 17:41:32 +0100 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2014-03-07 17:41:32 +0100 |
| commit | b7d3622a39fde7658170b7f3cf6c6889bb8db30d (patch) | |
| tree | 64f4e781ecb2a85d675e234072b988560bcd25f1 /drivers/macintosh/via-pmu.c | |
| parent | audit: whitespace fix in kernel-parameters.txt (diff) | |
| parent | Linux 3.13 (diff) | |
| download | linux-b7d3622a39fde7658170b7f3cf6c6889bb8db30d.tar.xz linux-b7d3622a39fde7658170b7f3cf6c6889bb8db30d.zip | |
Merge tag 'v3.13' into for-3.15
Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 283e1b53c6be..dee88e59f0d3 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -46,6 +46,8 @@ #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> |