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

Commit 5d1769ac authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 23a56e2c ce4b50f2

Documentation/video4linux/CARDLIST.cx88

+1 −1
Original line number Diff line number Diff line
@@ -42,4 +42,4 @@ 
 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]

 42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025]

 43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1]

 44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50]
 
 44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50,18ac:db54]

Documentation/video4linux/CARDLIST.saa7134

+3 −3
Original line number Diff line number Diff line 
  0 -> UNKNOWN/GENERIC

  1 -> Proteus Pro [philips reference design]   [1131:2001,1131:2001]

  2 -> LifeView FlyVIDEO3000                    [5168:0138,4e42:0138]

  3 -> LifeView FlyVIDEO2000                    [5168:0138]

  3 -> LifeView/Typhoon FlyVIDEO2000            [5168:0138,4e42:0138]

  4 -> EMPRESS                                  [1131:6752]

  5 -> SKNet Monster TV                         [1131:4e85]

  6 -> Tevion MD 9717
@@ -53,12 +53,12 @@ 
 52 -> AverMedia AverTV/305                     [1461:2108]

 53 -> ASUS TV-FM 7135                          [1043:4845]

 54 -> LifeView FlyTV Platinum FM               [5168:0214,1489:0214]

 55 -> LifeView FlyDVB-T DUO                    [5168:0502,5168:0306]

 55 -> LifeView FlyDVB-T DUO                    [5168:0306]

 56 -> Avermedia AVerTV 307                     [1461:a70a]

 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]

 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0351,1421:0370,1421:1370]

 59 -> Kworld/Tevion V-Stream Xpert TV PVR7134

 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502]

 60 -> LifeView/Typhoon FlyDVB-T Duo Cardbus    [5168:0502,4e42:0502]

 61 -> Philips TOUGH DVB-T reference design     [1131:2004]

 62 -> Compro VideoMate TV Gold+II

 63 -> Kworld Xpert TV PVR7134

MAINTAINERS

+7 −4
Original line number Diff line number Diff line
@@ -540,7 +540,8 @@ S: Supported 


BTTV VIDEO4LINUX DRIVER

P:	Mauro Carvalho Chehab

M:	mchehab@brturbo.com.br

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
@@ -837,11 +838,12 @@ S: Maintained 


DVB SUBSYSTEM AND DRIVERS

P:	LinuxTV.org Project

M: 	linux-dvb-maintainer@linuxtv.org

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Supported

S:	Maintained



EATA-DMA SCSI DRIVER

P:	Michael Neuffer
@@ -2956,7 +2958,8 @@ S: Maintained 


VIDEO FOR LINUX

P:	Mauro Carvalho Chehab

M:	mchehab@brturbo.com.br

M:	mchehab@infradead.org

M:	v4l-dvb-maintainer@linuxtv.org

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ export KBUILD_DEFCONFIG 
config %config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux

	$(Q)$(MAKE) $(build)=scripts/kconfig $@

	$(Q)$(MAKE) .kernelrelease

	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease



else

# ===========================================================================

arch/cris/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ $(SRC_ARCH)/.links: 
	@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib

	@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch

	@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S

	@ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@ln -sfn $(SRC_ARCH)/$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@touch $@



# Create link to sub arch includes