summaryrefslogtreecommitdiffstats
path: root/drivers/sgi
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-07 15:45:24 +0000
commit9f9f3e6e8548a596697778337110a423c384b6f3 (patch)
tree5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /drivers/sgi
parentd5c9a365ee7d2fded249aa5abfc5e89587583029 (diff)
Merge with Linux 2.3.49.
Diffstat (limited to 'drivers/sgi')
-rw-r--r--drivers/sgi/char/graphics_syms.c1
-rw-r--r--drivers/sgi/char/newport.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/sgi/char/graphics_syms.c b/drivers/sgi/char/graphics_syms.c
index 6e07d3b8b..0a36ed76e 100644
--- a/drivers/sgi/char/graphics_syms.c
+++ b/drivers/sgi/char/graphics_syms.c
@@ -8,7 +8,6 @@
*/
#define __NO_VERSION__
-#include <linux/config.h>
#include <linux/module.h>
/* extern int rrm_command (unsigned int cmd, void *arg);
diff --git a/drivers/sgi/char/newport.c b/drivers/sgi/char/newport.c
index 7fa4d65fe..74c9f294c 100644
--- a/drivers/sgi/char/newport.c
+++ b/drivers/sgi/char/newport.c
@@ -12,7 +12,6 @@
#include <asm/ng1.h>
#include <asm/uaccess.h>
#include <video/newport.h>
-#include <linux/config.h>
#include <linux/module.h>
struct newport_regs *npregs;