diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 20:59:09 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 20:59:09 +0100 |
commit | b8bc83971cc20cae3c3b65c26a804f350d74960c (patch) | |
tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/mips/lantiq/xway/pmu.c | |
parent | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff) | |
parent | bca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff) | |
download | linux-next-b8bc83971cc20cae3c3b65c26a804f350d74960c.tar.gz |
Merge branch 'pxa/devel' into next/devel2
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'arch/mips/lantiq/xway/pmu.c')
-rw-r--r-- | arch/mips/lantiq/xway/pmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/lantiq/xway/pmu.c b/arch/mips/lantiq/xway/pmu.c index 9d69f01e352b..39f0d2641cbf 100644 --- a/arch/mips/lantiq/xway/pmu.c +++ b/arch/mips/lantiq/xway/pmu.c @@ -8,7 +8,6 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/ioport.h> #include <lantiq_soc.h> |