diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 19:13:54 +0200 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/powerpc/sysdev/fsl_gtm.c | |
| parent | ARM: 6131/1: MAINTAINERS: update for ARM/Gemini (diff) | |
| parent | ARM: 6283/1: Remove useless PCIO_BASE definitions (diff) | |
| download | linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.tar.xz linux-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.zip | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/powerpc/sysdev/fsl_gtm.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_gtm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c index 714ec02fed2e..eca4545dd52e 100644 --- a/arch/powerpc/sysdev/fsl_gtm.c +++ b/arch/powerpc/sysdev/fsl_gtm.c @@ -20,6 +20,7 @@ #include <linux/of.h> #include <linux/spinlock.h> #include <linux/bitops.h> +#include <linux/slab.h> #include <asm/fsl_gtm.h> #define GTCFR_STP(x) ((x) & 1 ? 1 << 5 : 1 << 1) |