diff options
| author | Mauro Carvalho Chehab | 2015-01-27 12:39:34 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-01-27 12:39:34 +0100 |
| commit | 4a8ba3319764f4a254c0aa97072da0a67636c64b (patch) | |
| tree | ad59c5ab5c36f0606c79c7f43198c048cf765b1a /drivers/media/pci/cx23885/cx23885.h | |
| parent | [media] mb86a20s: remove unused debug modprobe parameter (diff) | |
| parent | Linux 3.19-rc6 (diff) | |
| download | kernel-qcow2-linux-4a8ba3319764f4a254c0aa97072da0a67636c64b.tar.gz kernel-qcow2-linux-4a8ba3319764f4a254c0aa97072da0a67636c64b.tar.xz kernel-qcow2-linux-4a8ba3319764f4a254c0aa97072da0a67636c64b.zip | |
Merge tag 'v3.19-rc6' into patchwork
This is needed in order to get the media fixes applied on -rc6.
Linux 3.19-rc6
* tag 'v3.19-rc6': (891 commits)
Linux 3.19-rc6
dm: fix handling of multiple internal suspends
hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro
hwmon: (i5500_temp) Convert to module_pci_driver
hwmon: (i5500_temp) Don't bind to disabled sensors
hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_groups
hwmon: (i5500_temp) New driver for the Intel 5500/5520/X58 chipsets
arm64: dts: add baud rate to Juno stdout-path
Revert "platform: x86: dell-laptop: Add support for keyboard backlight"
Revert "Documentation: Add entry for dell-laptop sysfs interface"
dm cache: fix problematic dual use of a single migration count variable
dm cache: share cache-metadata object across inactive and active DM tables
of/unittest: Overlays with sub-devices tests
KVM: x86: SYSENTER emulation is broken
KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE
x86/tsc: Change Fast TSC calibration failed from error to info
x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
x86, mm: Change cachemode exports to non-gpl
x86, tls: Interpret an all-zero struct user_desc as "no segment"
...
Conflicts:
drivers/media/pci/cx23885/cx23885.h
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885.h')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h index 4f358ebc8e6b..aeda8d3990ae 100644 --- a/drivers/media/pci/cx23885/cx23885.h +++ b/drivers/media/pci/cx23885/cx23885.h @@ -100,6 +100,7 @@ #define CX23885_BOARD_DVBSKY_S952 50 #define CX23885_BOARD_DVBSKY_T982 51 #define CX23885_BOARD_HAUPPAUGE_HVR5525 52 +#define CX23885_BOARD_HAUPPAUGE_STARBURST 53 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002 |