diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-17 03:32:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-17 03:32:59 -0800 |
| commit | 23237a431d3f8aa43140166530ce458447aa3e9d (patch) | |
| tree | 42480488a8a3d5095b882a666a1625e8b05deb16 | |
| parent | 2022f44610471fd7837defeccd6c49e80ce01579 (diff) | |
Fix up devfs handling for when it is disabled.
| -rw-r--r-- | include/linux/devfs_fs_kernel.h | 4 | ||||
| -rw-r--r-- | sound/core/info.c | 2 | ||||
| -rw-r--r-- | sound/core/sound.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h index f05155aaf71f..61ca61ae895c 100644 --- a/include/linux/devfs_fs_kernel.h +++ b/include/linux/devfs_fs_kernel.h @@ -39,10 +39,10 @@ typedef struct devfs_entry * devfs_handle_t; -extern void devfs_remove(const char *fmt, ...) __attribute__((format (printf, 1, 2))); - #ifdef CONFIG_DEVFS_FS +extern void devfs_remove(const char *fmt, ...) __attribute__((format (printf, 1, 2))); + struct unique_numspace { spinlock_t init_lock; diff --git a/sound/core/info.c b/sound/core/info.c index f9e7f43bc77f..c636f4c24a11 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -29,9 +29,7 @@ #include <sound/info.h> #include <sound/version.h> #include <linux/proc_fs.h> -#ifdef CONFIG_DEVFS_FS #include <linux/devfs_fs_kernel.h> -#endif #include <stdarg.h> /* diff --git a/sound/core/sound.c b/sound/core/sound.c index a5b85f4dd8b1..4d26a23e30e1 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -30,9 +30,7 @@ #include <sound/control.h> #include <sound/initval.h> #include <linux/kmod.h> -#ifdef CONFIG_DEVFS_FS #include <linux/devfs_fs_kernel.h> -#endif #define SNDRV_OS_MINORS 256 |