diff options
author | David Woodhouse | 2012-11-21 11:38:13 +0100 |
---|---|---|
committer | David Woodhouse | 2012-11-21 11:38:13 +0100 |
commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
tree | 495baa14e638817941496c36e1443aed7dae0ea0 /arch/mips/jz4740/time.c | |
parent | mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions() (diff) | |
parent | mtd: nand: fix Samsung SLC detection regression (diff) | |
download | kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.tar.gz kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.tar.xz kernel-qcow2-linux-851462444d421c223965b12b836bef63da61b57f.zip |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'arch/mips/jz4740/time.c')
-rw-r--r-- | arch/mips/jz4740/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c index f83c2dd07a27..39bb4bbf43e7 100644 --- a/arch/mips/jz4740/time.c +++ b/arch/mips/jz4740/time.c @@ -20,10 +20,10 @@ #include <linux/clockchips.h> #include <asm/mach-jz4740/irq.h> +#include <asm/mach-jz4740/timer.h> #include <asm/time.h> #include "clock.h" -#include "timer.h" #define TIMER_CLOCKEVENT 0 #define TIMER_CLOCKSOURCE 1 |