Merge branch 'master' of... (2b5c0c72) · Commits · 戴 / test

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		*.gz
		*.lzma
		*.patch
		*.gcno

		#
		# Top-level generic files

Documentation/dvb/get_dvb_firmware

+52 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ use IO::Handle;
		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",
		"dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
		"or51211", "or51132_qam", "or51132_vsb", "bluebird",
		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2" );
		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718" );

		# Check args
		syntax() if (scalar(@ARGV) != 1);
		@@ -381,6 +381,57 @@ sub cx18 {
		$allfiles;
		}

		sub mpc718 {
		my $archive = 'Yuan MPC718 TV Tuner Card 2.13.10.1016.zip';
		my $url = "ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/$archive";
		my $fwfile = "dvb-cx18-mpc718-mt352.fw";
		my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);

		checkstandard();
		wgetfile($archive, $url);
		unzip($archive, $tmpdir);

		my $sourcefile = "$tmpdir/Yuan MPC718 TV Tuner Card 2.13.10.1016/mpc718_32bit/yuanrap.sys";
		my $found = 0;

		open IN, '<', $sourcefile or die "Couldn't open $sourcefile to extract $fwfile data\n";
		binmode IN;
		open OUT, '>', $fwfile;
		binmode OUT;
		{
		# Block scope because we change the line terminator variable $/
		my $prevlen = 0;
		my $currlen;

		# Buried in the data segment are 3 runs of almost identical
		# register-value pairs that end in 0x5d 0x01 which is a "TUNER GO"
		# command for the MT352.
		# Pull out the middle run (because it's easy) of register-value
		# pairs to make the "firmware" file.

		local $/ = "\x5d\x01"; # MT352 "TUNER GO"

		while (<IN>) {
		$currlen = length($_);
		if ($prevlen == $currlen && $currlen <= 64) {
		chop; chop; # Get rid of "TUNER GO"
		s/^\0\0//; # get rid of leading 00 00 if it's there
		printf OUT "$_";
		$found = 1;
		last;
		}
		$prevlen = $currlen;
		}
		}
		close OUT;
		close IN;
		if (!$found) {
		unlink $fwfile;
		die "Couldn't find valid register-value sequence in $sourcefile for $fwfile\n";
		}
		$fwfile;
		}

		sub cx23885 {
		my $url = "http://linuxtv.org/downloads/firmware/";

Documentation/video4linux/CARDLIST.em28xx

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,3 +66,4 @@
		68 -> Terratec AV350 (em2860) [0ccd:0084]
		69 -> KWorld ATSC 315U HDTV TV Box (em2882) [eb1a:a313]
		70 -> Evga inDtube (em2882)
		71 -> Silvercrest Webcam 1.3mpix (em2820/em2840)

Makefile

+4 −5

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 31
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION
		@@ -140,15 +140,13 @@ _all: modules
		endif

		srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
		TOPDIR := $(srctree)
		# FIXME - TOPDIR is obsolete, use srctree/objtree
		objtree := $(CURDIR)
		src := $(srctree)
		obj := $(objtree)

		VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))

		export srctree objtree VPATH TOPDIR
		export srctree objtree VPATH


		# SUBARCH tells the usermode build what the underlying arch is. That is set
		@@ -344,7 +342,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__

		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common \
		-Werror-implicit-function-declaration
		-Werror-implicit-function-declaration \
		-Wno-format-security
		KBUILD_AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)

arch/ia64/pci/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,7 @@ pcibios_align_resource (void data, struct resource res,
		/*
		* PCI BIOS setup, always defaults to SAL interface
		*/
		char * __devinit
		char * __init
		pcibios_setup (char *str)
		{
		return str;

Admin message