From: Andrew Morton Date: Fri, 24 Mar 2006 11:18:44 +0000 (-0800) Subject: [PATCH] fix build error if CONFIG_SYSFS=n X-Git-Tag: v2.6.17-rc1~867 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f125b56113be4956867cc9bd098bb99b1b9bb93f;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git [PATCH] fix build error if CONFIG_SYSFS=n uevent_seqnum and uevent_helper are only defined if CONFIG_HOTPLUG=y, CONFIG_NET=n. (I stole this back from Greg's tree - it makes allnoconfig work). Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index f2690ed..f119e09 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -22,7 +22,7 @@ static struct subsys_attribute _name##_attr = __ATTR_RO(_name) static struct subsys_attribute _name##_attr = \ __ATTR(_name, 0644, _name##_show, _name##_store) -#ifdef CONFIG_HOTPLUG +#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) /* current uevent sequence number */ static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page) { @@ -52,7 +52,7 @@ decl_subsys(kernel, NULL, NULL); EXPORT_SYMBOL_GPL(kernel_subsys); static struct attribute * kernel_attrs[] = { -#ifdef CONFIG_HOTPLUG +#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) &uevent_seqnum_attr.attr, &uevent_helper_attr.attr, #endif