diff options
author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/media/dvb/bt8xx/dvb-bt8xx.h | |
parent | [AGPGART] Make AGP depend on PCI (diff) | |
parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/media/dvb/bt8xx/dvb-bt8xx.h')
-rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 00dd9fa54c82..4745a9017a19 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h @@ -37,6 +37,8 @@ #include "cx24110.h" #include "or51211.h" #include "lgdt330x.h" +#include "lg_h06xf.h" +#include "zl10353.h" struct dvb_bt8xx_card { struct mutex lock; |