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

Commit 947ca2e9 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

parents 1946d6ef 6b4bfb87

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 30

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*

arch/arm/mach-mx2/clock_imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static struct clk clko_clk = { 
		.con_id = n, \

		.clk = &c, \

	},

static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

/* It's unlikely that any driver wants one of them directly:

	_REGISTER_CLOCK(NULL, "ckih", ckih_clk)

	_REGISTER_CLOCK(NULL, "ckil", ckil_clk)

arch/arm/mach-mx2/clock_imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ DEFINE_CLOCK1(csi_clk, 0, 0, 0, parent, &csi_clk1, &per4_clk); 
		.clk = &c, \

	},



static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)

	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)

	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)

arch/arm/mach-mx3/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ DEFINE_CLOCK(gpu2d_clk, 0, CCM_CGR3, 4, NULL, NULL); 
		.clk = &c,		\

	},



static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK(NULL, "asrc", asrc_clk)

	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)

arch/arm/mach-mx3/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ DEFINE_CLOCK(ipg_clk, 0, NULL, 0, ipg_get_rate, NULL, &ahb_clk); 
		.clk = &c, \

	},



static struct clk_lookup lookups[] __initdata = {

static struct clk_lookup lookups[] = {

	_REGISTER_CLOCK(NULL, "emi", emi_clk)

	_REGISTER_CLOCK(NULL, "cspi", cspi1_clk)

	_REGISTER_CLOCK(NULL, "cspi", cspi2_clk)