Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45570eb authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents abc23585 474844f7

arch/arm/mach-omap1/board-h2.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/mtd/nand.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/workqueue.h>





#include <asm/hardware.h>

#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

arch/arm/mach-omap2/clock.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 




#include <asm/arch/clock.h>

#include <asm/arch/clock.h>

#include <asm/arch/sram.h>

#include <asm/arch/sram.h>

#include <asm/div64.h>





#include "prcm-regs.h"

#include "prcm-regs.h"

#include "memory.h"

#include "memory.h"

arch/arm/mach-omap2/clock.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -1013,7 +1013,8 @@ static struct clk dss2_fck = { /* Alt clk used in power management */ 
	.name		= "dss2_fck",

	.name		= "dss2_fck",

	.parent		= &sys_ck,		/* fixed at sys_ck or 48MHz */

	.parent		= &sys_ck,		/* fixed at sys_ck or 48MHz */

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

	.flags		= CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |

				RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED,

				RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED |

				DELAYED_APP,

	.enable_reg	= (void __iomem *)&CM_FCLKEN1_CORE,

	.enable_reg	= (void __iomem *)&CM_FCLKEN1_CORE,

	.enable_bit	= 1,

	.enable_bit	= 1,

	.src_offset	= 13,

	.src_offset	= 13,