diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /drivers/block | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
| download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 1 | ||||
| -rw-r--r-- | drivers/block/cpqarray.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 99f87efe0f58..36b88f6c5f82 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -20,7 +20,6 @@ * */ -#include <linux/config.h> /* CONFIG_PROC_FS */ #include <linux/module.h> #include <linux/interrupt.h> #include <linux/types.h> diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 4abc193314ee..ada68e65b5ff 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -19,7 +19,6 @@ * Questions/Comments/Bugfixes to iss_storagedev@hp.com * */ -#include <linux/config.h> /* CONFIG_PROC_FS */ #include <linux/module.h> #include <linux/types.h> #include <linux/pci.h> |