Commit 257e2ce7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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>)
parent f751e52a
...@@ -256,7 +256,7 @@ more details, with real examples. ...@@ -256,7 +256,7 @@ more details, with real examples.
Example: Example:
#fs/Makefile #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) 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 the corresponding obj- variable will be set, and kbuild will descend
......
...@@ -2872,3 +2872,4 @@ EXPORT_SYMBOL(blk_run_queue); ...@@ -2872,3 +2872,4 @@ EXPORT_SYMBOL(blk_run_queue);
EXPORT_SYMBOL(blk_run_queues); EXPORT_SYMBOL(blk_run_queues);
EXPORT_SYMBOL(blk_rq_bio_prep); EXPORT_SYMBOL(blk_rq_bio_prep);
EXPORT_SYMBOL(blk_rq_prep_restart);
...@@ -318,7 +318,7 @@ void __exit agp_exit(void) ...@@ -318,7 +318,7 @@ void __exit agp_exit(void)
{ {
} }
#ifdef MODULE #ifndef MODULE
static __init int agp_setup(char *s) static __init int agp_setup(char *s)
{ {
if (!strcmp(s,"off")) if (!strcmp(s,"off"))
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/compile.h>
#include <linux/version.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/**************************************************/ /**************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment