Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel

[karo-tx-linux.git] / drivers / video / riva / nv_driver.c

diff --git a/drivers/video/riva/nv_driver.c b/drivers/video/riva/nv_driver.c
index a11026812d1b6d169c66ba7badd923f01bd9a051..f3694cf17e58097ea72b398de6717e217d9d3adb 100644 (file)
--- a/drivers/video/riva/nv_driver.c
+++ b/drivers/video/riva/nv_driver.c
@@ -41,11 +41,6 @@
 #include "rivafb.h"
 #include "nvreg.h"
 
-
-#ifndef CONFIG_PCI             /* sanity check */
-#error This driver requires PCI support.
-#endif
-
 #define PFX "rivafb: "
 
 static inline unsigned char MISCin(struct riva_par *par)
@@ -163,7 +158,7 @@ unsigned long riva_get_memlen(struct riva_par *par)
        unsigned long memlen = 0;
        unsigned int chipset = par->Chipset;
        struct pci_dev* dev;
-       int amt;
+       u32 amt;
 
        switch (chip->Architecture) {
        case NV_ARCH_03: