Recent changes have broken compilation when CONFIG_IDE_PROC_FS is not set. Signed-off-by: Elias Oltmanns <eo@xxxxxxxxxxxxxx> --- Applies to next-20080829. drivers/ide/Makefile | 9 +++++++-- drivers/ide/ide-disk.h | 2 ++ drivers/ide/ide-floppy.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 95a6135..e6e7811 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile @@ -36,9 +36,14 @@ obj-$(CONFIG_IDE_H8300) += h8300/ obj-$(CONFIG_IDE_GENERIC) += ide-generic.o obj-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o -ide-disk_mod-y += ide-disk.o ide-disk_ioctl.o ide-disk_proc.o +ide-disk_mod-y += ide-disk.o ide-disk_ioctl.o ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o -ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o ide-floppy_proc.o +ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o + +ifeq ($(CONFIG_IDE_PROC_FS), y) + ide-disk_mod-y += ide-disk_proc.o + ide-floppy_mod-y += ide-floppy_proc.o +endif obj-$(CONFIG_BLK_DEV_IDEDISK) += ide-disk_mod.o obj-$(CONFIG_BLK_DEV_IDECD) += ide-cd_mod.o diff --git a/drivers/ide/ide-disk.h b/drivers/ide/ide-disk.h index f937772..5254cae 100644 --- a/drivers/ide/ide-disk.h +++ b/drivers/ide/ide-disk.h @@ -23,8 +23,10 @@ ide_decl_devset(acoustic); /* ide-disk_ioctl.c */ int ide_disk_ioctl(struct inode *, struct file *, unsigned int, unsigned long); +#ifdef CONFIG_IDE_PROC_FS /* ide-disk_proc.c */ extern ide_proc_entry_t ide_disk_proc[]; extern const struct ide_proc_devset ide_disk_settings[]; +#endif /* CONFIG_IDE_PROC_FS */ #endif /* __IDE_DISK_H */ diff --git a/drivers/ide/ide-floppy.h b/drivers/ide/ide-floppy.h index 2ad373e..86ee37e 100644 --- a/drivers/ide/ide-floppy.h +++ b/drivers/ide/ide-floppy.h @@ -53,8 +53,10 @@ sector_t ide_floppy_capacity(ide_drive_t *); /* ide-floppy_ioctl.c */ int ide_floppy_ioctl(struct inode *, struct file *, unsigned, unsigned long); +#ifdef CONFIG_IDE_PROC_FS /* ide-floppy_proc.c */ extern ide_proc_entry_t ide_floppy_proc[]; extern const struct ide_proc_devset ide_floppy_settings[]; +#endif /* CONFIG_IDE_PROC_FS */ #endif /*__IDE_FLOPPY_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
