summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/video
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/cyberfb.c2
-rw-r--r--drivers/video/fbcon-afb.c1
-rw-r--r--drivers/video/fbcon-cfb16.c1
-rw-r--r--drivers/video/fbcon-cfb2.c1
-rw-r--r--drivers/video/fbcon-cfb24.c1
-rw-r--r--drivers/video/fbcon-cfb32.c1
-rw-r--r--drivers/video/fbcon-cfb4.c1
-rw-r--r--drivers/video/fbcon-cfb8.c1
-rw-r--r--drivers/video/fbcon-mac.c1
-rw-r--r--drivers/video/fbcon-mfb.c1
-rw-r--r--drivers/video/skeletonfb.c1
11 files changed, 2 insertions, 10 deletions
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 2eaacb57d..c0767a0f0 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -20,7 +20,7 @@
* for more details.
*/
-
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
diff --git a/drivers/video/fbcon-afb.c b/drivers/video/fbcon-afb.c
index 66132809a..efe9833cb 100644
--- a/drivers/video/fbcon-afb.c
+++ b/drivers/video/fbcon-afb.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb16.c b/drivers/video/fbcon-cfb16.c
index b27683c95..475095988 100644
--- a/drivers/video/fbcon-cfb16.c
+++ b/drivers/video/fbcon-cfb16.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb2.c b/drivers/video/fbcon-cfb2.c
index 617c85235..6ed68e89d 100644
--- a/drivers/video/fbcon-cfb2.c
+++ b/drivers/video/fbcon-cfb2.c
@@ -14,7 +14,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb24.c b/drivers/video/fbcon-cfb24.c
index 65a4ad556..2a95a28cf 100644
--- a/drivers/video/fbcon-cfb24.c
+++ b/drivers/video/fbcon-cfb24.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb32.c b/drivers/video/fbcon-cfb32.c
index 8c3306458..cedc04814 100644
--- a/drivers/video/fbcon-cfb32.c
+++ b/drivers/video/fbcon-cfb32.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb4.c b/drivers/video/fbcon-cfb4.c
index bcdfcc436..8df065695 100644
--- a/drivers/video/fbcon-cfb4.c
+++ b/drivers/video/fbcon-cfb4.c
@@ -14,7 +14,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-cfb8.c b/drivers/video/fbcon-cfb8.c
index c559f4025..dcd3ebd97 100644
--- a/drivers/video/fbcon-cfb8.c
+++ b/drivers/video/fbcon-cfb8.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/fbcon-mac.c b/drivers/video/fbcon-mac.c
index 1dd5f1988..5518e5def 100644
--- a/drivers/video/fbcon-mac.c
+++ b/drivers/video/fbcon-mac.c
@@ -16,7 +16,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include <linux/delay.h>
diff --git a/drivers/video/fbcon-mfb.c b/drivers/video/fbcon-mfb.c
index 3484cef2a..60ef11221 100644
--- a/drivers/video/fbcon-mfb.c
+++ b/drivers/video/fbcon-mfb.c
@@ -13,7 +13,6 @@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/string.h>
-#include <linux/config.h>
#include <linux/fb.h>
#include "fbcon.h"
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 3f795cd63..e2c553392 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -8,6 +8,7 @@
* for more details.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>