aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/riva
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-04-28 05:15:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:40 -0400
commit7ce3ab100e4e115ca2c4fd931844a0f1a50df406 (patch)
tree8cc06ef819aa8dd6ce89b4c34c89b9395a7e2a02 /drivers/video/riva
parentaffc23d11631a47d35dfd552ded8ca255c001490 (diff)
fbdev: nv: drop useless CONFIG_PCI checks
Both FB_RIVA and FB_NVIDIA depends on PCI, so CONFIG_PCI always defined for them. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Antonino A. Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/riva')
-rw-r--r--drivers/video/riva/fbdev.c4
-rw-r--r--drivers/video/riva/nv_driver.c5
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 46a9237a11e4..08a9b56cb575 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -56,10 +56,6 @@
56#include "rivafb.h" 56#include "rivafb.h"
57#include "nvreg.h" 57#include "nvreg.h"
58 58
59#ifndef CONFIG_PCI /* sanity check */
60#error This driver requires PCI support.
61#endif
62
63/* version number of this driver */ 59/* version number of this driver */
64#define RIVAFB_VERSION "0.9.5b" 60#define RIVAFB_VERSION "0.9.5b"
65 61
diff --git a/drivers/video/riva/nv_driver.c b/drivers/video/riva/nv_driver.c
index a11026812d1b..a1181149da74 100644
--- a/drivers/video/riva/nv_driver.c
+++ b/drivers/video/riva/nv_driver.c
@@ -41,11 +41,6 @@
41#include "rivafb.h" 41#include "rivafb.h"
42#include "nvreg.h" 42#include "nvreg.h"
43 43
44
45#ifndef CONFIG_PCI /* sanity check */
46#error This driver requires PCI support.
47#endif
48
49#define PFX "rivafb: " 44#define PFX "rivafb: "
50 45
51static inline unsigned char MISCin(struct riva_par *par) 46static inline unsigned char MISCin(struct riva_par *par)