Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (ac0c955d) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/DocBook/uio-howto.tmpl

+0 −4

Original line number	Diff line number	Diff line
		@@ -133,10 +133,6 @@ interested in translating it, please email me
		<para>updates of your driver can take place without recompiling
		the kernel.</para>
		</listitem>
		<listitem>
		<para>if you need to keep some parts of your driver closed source,
		you can do so without violating the GPL license on the kernel.</para>
		</listitem>
		</itemizedlist>

		<sect1 id="how_uio_works">

Documentation/accounting/getdelays.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,7 @@ void print_delayacct(struct taskstats *t)
		"IO %15s%15s\n"
		" %15llu%15llu\n"
		"MEM %15s%15s\n"
		" %15llu%15llu\n"
		" %15llu%15llu\n",
		"count", "real total", "virtual total", "delay total",
		t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
		t->cpu_delay_total,

Documentation/dvb/get_dvb_firmware

+12 −12

Original line number	Diff line number	Diff line
		@@ -111,8 +111,8 @@ sub tda10045 {
		}

		sub tda10046 {
		my $sourcefile = "tt_budget_217g.zip";
		my $url = "http://www.technotrend.de/new/217g/$sourcefile";
		my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip";
		my $url = "http://technotrend-online.com/download/software/219/$sourcefile";
		my $hash = "6a7e1e2f2644b162ff0502367553c72d";
		my $outfile = "dvb-fe-tda10046.fw";
		my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
		@@ -121,7 +121,7 @@ sub tda10046 {

		wgetfile($sourcefile, $url);
		unzip($sourcefile, $tmpdir);
		extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24478, "$tmpdir/fwtmp");
		extract("$tmpdir/TT_PCI_2.19h_28_11_2006/software/OEM/PCI/App/ttlcdacc.dll", 0x65389, 24478, "$tmpdir/fwtmp");
		verify("$tmpdir/fwtmp", $hash);
		copy("$tmpdir/fwtmp", $outfile);

Documentation/fb/pvr2fb.txt

+13 −9

Original line number	Diff line number	Diff line
		@@ -9,14 +9,13 @@ one found in the Dreamcast.
		Advantages:

		* It provides a nice large console (128 cols + 48 lines with 1024x768)
		without using tiny, unreadable fonts.
		without using tiny, unreadable fonts (NOT on the Dreamcast)
		* You can run XF86_FBDev on top of /dev/fb0
		* Most important: boot logo :-)

		Disadvantages:

		* Driver is currently limited to the Dreamcast PowerVR 2 implementation
		at the time of this writing.
		* Driver is largely untested on non-Dreamcast systems.

		Configuration
		=============
		@@ -29,11 +28,16 @@ Accepted options:
		font:X - default font to use. All fonts are supported, including the
		SUN12x22 font which is very nice at high resolutions.

		mode:X - default video mode. The following video modes are supported:
		640x240-60, 640x480-60.

		mode:X - default video mode with format [xres]x[yres]-<bpp>@<refresh rate>
		The following video modes are supported:
		640x640-16@60, 640x480-24@60, 640x480-32@60. The Dreamcast
		defaults to 640x480-16@60. At the time of writing the
		24bpp and 32bpp modes function poorly. Work to fix that is
		ongoing

		Note: the 640x240 mode is currently broken, and should not be
		used for any reason. It is only mentioned as a reference.
		used for any reason. It is only mentioned here as a reference.

		inverse - invert colors on screen (for LCD displays)

		@@ -52,10 +56,10 @@ output:X - output type. This can be any of the following: pal, ntsc, and
		X11
		===

		XF86_FBDev should work, in theory. At the time of this writing it is
		totally untested and may or may not even portray the beginnings of
		working. If you end up testing this, please let me know!
		XF86_FBDev has been shown to work on the Dreamcast in the past - though not yet
		on any 2.6 series kernel.

		--
		Paul Mundt <lethal@linuxdc.org>
		Updated by Adrian McMenamin <adrian@mcmen.demon.co.uk>

Documentation/i386/zero-page.txt

+10 −0

Original line number	Diff line number	Diff line
		---------------------------------------------------------------------------
		!!!!!!!!!!!!!!!WARNING!!!!!!!!
		The zero page is a kernel internal data structure, not a stable ABI. It might change
		without warning and the kernel has no way to detect old version of it.
		If you're writing some external code like a boot loader you should only use
		the stable versioned real mode boot protocol described in boot.txt. Otherwise the kernel
		might break you at any time.
		!!!!!!!!!!!!!WARNING!!!!!!!!!!!
		----------------------------------------------------------------------------

		Summary of boot_params layout (kernel point of view)
		( collected by Hans Lermen and Martin Mares )