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

Commit 3879f5d6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel

Conflicts:

	drivers/video/mx3fb.c
parents 607b067e 6e1588cb
Loading
Loading
Loading
Loading
+1150 −1150
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,

	/*
	 * Calculate divider: fractional part is 4 bits so simply multiple by
        * 24 to get fractional part, as long as we stay under ~250MHz and on
	 * 2^4 to get fractional part, as long as we stay under ~250MHz and on
	 * i.MX31 it (HSP_CLK) is <= 178MHz. Currently 128.267MHz
	 */
	dev_dbg(mx3fb->dev, "pixel clk = %d\n", pixel_clk);
+13 −13

File changed.

Contains only whitespace changes.

+10 −10

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.