From 257e2ce7256a7a5a93a79d65e1e64818f940c11a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 23 Sep 2003 09:43:36 -0700
Subject: [PATCH] [PATCH] misc fixes

- modules need blk_rq_prep_restart()  (Florian Schanda <ma1flfs@bath.ac.uk>)

- Remove unneeded inclusions from configs.c (Randy Dunlap)

- The agp_setup() ifdef was backwards (Stephen Hemminger <shemminger@osdl.org>)

- makefiles.txt typo fix (Paolo Ornati <ornati@despammed.com>)
---
 Documentation/kbuild/makefiles.txt | 2 +-
 drivers/block/ll_rw_blk.c          | 1 +
 drivers/char/agp/backend.c         | 2 +-
 kernel/configs.c                   | 2 --
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 019558520b359..e0a590afead2a 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -256,7 +256,7 @@ more details, with real examples.
 
 	Example:
 		#fs/Makefile
-		obj-$(CONfIG_EXT2_FS) += ext2/
+		obj-$(CONFIG_EXT2_FS) += ext2/
 
 	If CONFIG_EXT2_FS is set to either 'y' (built-in) or 'm' (modular)
 	the corresponding obj- variable will be set, and kbuild will descend
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index ef3a99948fc99..339d8c50e2c5a 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -2872,3 +2872,4 @@ EXPORT_SYMBOL(blk_run_queue);
 EXPORT_SYMBOL(blk_run_queues);
 
 EXPORT_SYMBOL(blk_rq_bio_prep);
+EXPORT_SYMBOL(blk_rq_prep_restart);
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index cff44cad625c1..7b3f652f6a966 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -318,7 +318,7 @@ void __exit agp_exit(void)
 {
 }
 
-#ifdef MODULE
+#ifndef MODULE
 static __init int agp_setup(char *s)
 {
 	if (!strcmp(s,"off"))
diff --git a/kernel/configs.c b/kernel/configs.c
index 57f54451edbe9..b0e1317563d9e 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -29,8 +29,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
-#include <linux/compile.h>
-#include <linux/version.h>
 #include <asm/uaccess.h>
 
 /**************************************************/
-- 
2.53.0