diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-10 01:07:48 +0100 |
| commit | a36ae95c4e220afb976dd9d0d813d01e882b7b59 (patch) | |
| tree | 5a128e3f6a5a0d29c9dfd81a116381452951318f /arch/arm/mach-exynos/cpuidle.c | |
| parent | USB: ohci-s3c2410: add PM support (diff) | |
| parent | Linux 3.2-rc4 (diff) | |
| download | linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.tar.xz linux-a36ae95c4e220afb976dd9d0d813d01e882b7b59.zip | |
Merge v3.2-rc4 into usb-next
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-exynos/cpuidle.c')
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index 35f6502144ae..4ebb382c5979 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -12,6 +12,8 @@ #include <linux/init.h> #include <linux/cpuidle.h> #include <linux/io.h> +#include <linux/export.h> +#include <linux/time.h> #include <asm/proc-fns.h> |