diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:16:55 -0400 |
| commit | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (patch) | |
| tree | 999c6a6580b76a083c8efb9dabff709d1c49fcd0 /drivers/media/video/cx231xx/cx231xx.h | |
| parent | 492b057c426e4aa747484958e18e9da29003985d (diff) | |
| parent | 3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx.h')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index aa4a23ef491a..e38eb2d425f7 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
| @@ -738,7 +738,7 @@ extern void cx231xx_card_setup(struct cx231xx *dev); | |||
| 738 | extern struct cx231xx_board cx231xx_boards[]; | 738 | extern struct cx231xx_board cx231xx_boards[]; |
| 739 | extern struct usb_device_id cx231xx_id_table[]; | 739 | extern struct usb_device_id cx231xx_id_table[]; |
| 740 | extern const unsigned int cx231xx_bcount; | 740 | extern const unsigned int cx231xx_bcount; |
| 741 | void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir); | 741 | void cx231xx_register_i2c_ir(struct cx231xx *dev); |
| 742 | int cx231xx_tuner_callback(void *ptr, int component, int command, int arg); | 742 | int cx231xx_tuner_callback(void *ptr, int component, int command, int arg); |
| 743 | 743 | ||
| 744 | /* Provided by cx231xx-input.c */ | 744 | /* Provided by cx231xx-input.c */ |