[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>)

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 019558520b359c0f6ec2f62fb81d5ad9d1a377f2..e0a590afead2a2a3dd3557a00ed614c29cf00a6a 100644 (file)
--- 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 ef3a99948fc99aea3a2c857829867713e23afdf2..339d8c50e2c5a540babf670cb3ae9e8902b9020d 100644 (file)
--- 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 cff44cad625c1d7c4ea9e0da89143485252bd444..7b3f652f6a9669c291737f139ad041e441f49b73 100644 (file)
--- 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 57f54451edbe9370104a79c48785e0996b65acde..b0e1317563d9e0aeae18c27932ad6f0d1c626335 100644 (file)
--- 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>
 
 /**************************************************/