diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
| commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
| tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /drivers/media/video/bttvp.h | |
| parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
| parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/media/video/bttvp.h')
| -rw-r--r-- | drivers/media/video/bttvp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 3aa9c6e4fc33..1e6a5632c3c7 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <media/tveeprom.h> | 45 | #include <media/tveeprom.h> |
| 46 | #include <media/ir-common.h> | 46 | #include <media/ir-common.h> |
| 47 | 47 | ||
| 48 | |||
| 48 | #include "bt848.h" | 49 | #include "bt848.h" |
| 49 | #include "bttv.h" | 50 | #include "bttv.h" |
| 50 | #include "btcx-risc.h" | 51 | #include "btcx-risc.h" |