From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Sun, 9 Jan 2011 17:02:24 +0000 (-0500)
Subject: trying to fix following warning: 'override: reassigning to symbol SYSFS_DEPRECATED_V2'
X-Git-Tag: linux-2.6-32-8~1
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=c8ca52fb4110dd9637970010837bfe2b79763144

trying to fix following warning: 'override: reassigning to symbol SYSFS_DEPRECATED_V2'
---

diff --git a/Makefile b/Makefile
index 0cee0f320..0bcb0bf10 100644
--- a/Makefile
+++ b/Makefile
@@ -86,12 +86,13 @@ trees: sources
 srpm: sources
 	mkdir -p SOURCES SRPMS
 	(cd SOURCES; rpm2cpio ../$(SOURCE_RPM) | cpio -diu; \
-	 cp ../$(notdir $(SPECFILE)) . ; cp ../linux-*.patch .; cp ../config-vserver . ; cp ../config-planetlab .; cp ../config-workarounds .; \
+	 cp ../$(notdir $(SPECFILE)) . ; cp ../linux-*.patch .; cp ../config-vserver . ; cp ../config-planetlab .; \
 	 for downloaded in $(SOURCEFILES) ; do cp ../$$downloaded . ; done ; \
 	 cat config-vserver >> config-generic ; \
 	 cat config-planetlab >> config-generic ; \
-	 cat config-workarounds >> config-generic ; \
 	 sed -i -e "s,CONFIG_IPV6=m,CONFIG_IPV6=y,g" config-generic ;\
+	 sed -i -e "s,# CONFIG_SYSFS_DEPRECATED is not set,CONFIG_SYSFS_DEPRECATED=y,g" config-generic ;\
+	 sed -i -e "s,# CONFIG_SYSFS_DEPRECATED_V2 is not set,CONFIG_SYSFS_DEPRECATED_V2=y,g" config-generic ;\
 	 sed -i -e "s,CONFIG_MODULE_SIG=y,CONFIG_MODULE_SIG=n,g" config-generic-rhel ;\
 	 sed -i -e "/\# CONFIG_KVM is not set/d" config-x86-generic-rhel)
 	./rpmmacros.sh
diff --git a/config-workarounds b/config-workarounds
deleted file mode 100644
index cb6bdf7f4..000000000
--- a/config-workarounds
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYSFS_DEPRECATED_V2=y