diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
| commit | a2fe194723f6e4990d01d8c208c7b138fd410522 (patch) | |
| tree | 7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /drivers/media/video/cx23885/cx23885.h | |
| parent | c3b7cdf180090d2686239a75bb0ae408108ed749 (diff) | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index d884784a1c85..13c37ec07ae7 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
| @@ -90,6 +90,7 @@ | |||
| 90 | #define CX23885_BOARD_MYGICA_X8507 33 | 90 | #define CX23885_BOARD_MYGICA_X8507 33 |
| 91 | #define CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL 34 | 91 | #define CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL 34 |
| 92 | #define CX23885_BOARD_TEVII_S471 35 | 92 | #define CX23885_BOARD_TEVII_S471 35 |
| 93 | #define CX23885_BOARD_HAUPPAUGE_HVR1255_22111 36 | ||
| 93 | 94 | ||
| 94 | #define GPIO_0 0x00000001 | 95 | #define GPIO_0 0x00000001 |
| 95 | #define GPIO_1 0x00000002 | 96 | #define GPIO_1 0x00000002 |