diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-05-16 07:46:44 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-16 08:12:12 -0400 |
commit | ce589a0328866228412ea0df2c834688da8f4700 (patch) | |
tree | 548c843d4750223a3ebef78de0b88d67c2b5f319 | |
parent | f41a5f804a5862e9b87cf2d4cca1d6a7db7a9e82 (diff) |
drivers/mtd/devices/docprobe.c: correct #if's
On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.17-rc3-mm1:
>...
> git-mtd.patch
>...
> git trees
>...
If we correct the names of the config options, the code might actually
work as intended...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | drivers/mtd/devices/docprobe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c index 32f1d332f5b5..42ec08416a60 100644 --- a/drivers/mtd/devices/docprobe.c +++ b/drivers/mtd/devices/docprobe.c | |||
@@ -231,21 +231,21 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr | |||
231 | 231 | ||
232 | static int docfound; | 232 | static int docfound; |
233 | 233 | ||
234 | #ifdef CONFIG_DOC2000 | 234 | #ifdef CONFIG_MTD_DOC2000 |
235 | extern void DoC2k_init(struct mtd_info *); | 235 | extern void DoC2k_init(struct mtd_info *); |
236 | #define doc2k_initfunc (&DoC2k_init) | 236 | #define doc2k_initfunc (&DoC2k_init) |
237 | #else | 237 | #else |
238 | #define doc2k_initfunc NULL | 238 | #define doc2k_initfunc NULL |
239 | #endif | 239 | #endif |
240 | 240 | ||
241 | #ifdef CONFIG_DOC2001 | 241 | #ifdef CONFIG_MTD_DOC2001 |
242 | extern void DoCMil_init(struct mtd_info *); | 242 | extern void DoCMil_init(struct mtd_info *); |
243 | #define docmil_initfunc (&DoCMil_init) | 243 | #define docmil_initfunc (&DoCMil_init) |
244 | #else | 244 | #else |
245 | #define docmil_initfunc NULL | 245 | #define docmil_initfunc NULL |
246 | #endif | 246 | #endif |
247 | 247 | ||
248 | #ifdef CONFIG_DOC2001PLUS | 248 | #ifdef CONFIG_MTD_DOC2001PLUS |
249 | extern void DoCMilPlus_init(struct mtd_info *); | 249 | extern void DoCMilPlus_init(struct mtd_info *); |
250 | #define docmplus_initfunc (&DoCMilPlus_init) | 250 | #define docmplus_initfunc (&DoCMilPlus_init) |
251 | #else | 251 | #else |