include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / video / bt8xx / bttv-risc.c

diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index 5b1b8e4..c24b1c1 100644 (file)
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -26,6 +26,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
@@ -341,7 +342,7 @@ bttv_calc_geo_old(struct bttv *btv, struct bttv_geometry *geo,
        int totalwidth   = tvnorm->totalwidth;
        int scaledtwidth = tvnorm->scaledtwidth;
 
-       if (bttv_tvcards[btv->c.type].muxsel[btv->input] < 0) {
+       if (btv->input == btv->dig) {
                swidth       = 720;
                totalwidth   = 858;
                scaledtwidth = 858;
@@ -391,7 +392,7 @@ bttv_calc_geo               (struct bttv *                  btv,
             && crop->width == tvnorm->cropcap.defrect.width
             && crop->height == tvnorm->cropcap.defrect.height
             && width <= tvnorm->swidth /* see PAL-Nc et al */)
-           || bttv_tvcards[btv->c.type].muxsel[btv->input] < 0) {
+           || btv->input == btv->dig) {
                bttv_calc_geo_old(btv, geo, width, height,
                                  both_fields, tvnorm);
                return;