tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

authored by Russell King and committed by Russell King a45570eb abc23585

+4 -1
unified split
+1
arch/arm/mach-omap1/board-h2.c
··· 27 27 #include <linux/mtd/nand.h> 28 28 #include <linux/mtd/partitions.h> 29 29 #include <linux/input.h> 30 + #include <linux/workqueue.h> 30 31 31 32 #include <asm/hardware.h> 32 33 #include <asm/mach-types.h>
+1
arch/arm/mach-omap2/clock.c
··· 27 27 28 28 #include <asm/arch/clock.h> 29 29 #include <asm/arch/sram.h> 30 + #include <asm/div64.h> 30 31 31 32 #include "prcm-regs.h" 32 33 #include "memory.h"
+2 -1
arch/arm/mach-omap2/clock.h
··· 1013 1013 .name = "dss2_fck", 1014 1014 .parent = &sys_ck, /* fixed at sys_ck or 48MHz */ 1015 1015 .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | 1016 - RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED, 1016 + RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED | 1017 + DELAYED_APP, 1017 1018 .enable_reg = (void __iomem *)&CM_FCLKEN1_CORE, 1018 1019 .enable_bit = 1, 1019 1020 .src_offset = 13,