| Date | Sun, 3 Sep 2006 19:25:28 +0200 | From | Adrian Bunk <> | Subject | 2.6.18-rc5-mm1: sysfs_init() related compile error |
| |
I'm getting the following compile error on h8300:
<-- snip -->
... CC arch/h8300/kernel/asm-offsets.s In file included from /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/include/linux/kobject.h:22, from /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/include/linux/sysdev.h:24, from /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/include/linux/sched.h:1605, from /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/h8300/kernel/asm-offsets.c:12: /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/include/linux/sysfs.h:210: error: redefinition of 'sysfs_init' /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/include/linux/sysfs.h:136: error: previous definition of 'sysfs_init' was here make[2]: *** [arch/h8300/kernel/asm-offsets.s] Error 1
<-- snip -->
The problem is a merge conflict since both git-block.patch and gregkh-driver-sysfs-add-proper-sysfs_init-prototype.patch added sysfs_init() prototypes and CONFIG_SYSFS=n dummmies to sysfs.h .
The git-block.patch version lacks the __must_check annotation.
cu Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
-- VGER BF report: H 0.332312 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|