diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/media/video/bttvp.h | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
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" |