From: Karel Zak <kzak@redhat.com>
Date: Mon, 3 Mar 2014 11:10:08 +0000 (+0100)
Subject: libmount: cgroup magic already defined
X-Git-Tag: v2.25-rc1~565
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870c616d604a8a8665240dccd6691fcd5038fb43;p=thirdparty%2Futil-linux.git

libmount: cgroup magic already defined

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 6170752bc2..d402b7ef5d 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -327,9 +327,6 @@ int mnt_fstype_is_netfs(const char *type)
 #ifndef XFS_SUPER_MAGIC
 # define XFS_SUPER_MAGIC	0x58465342
 #endif
-#ifndef CGROUP_SUPER_MAGIC
-# define CGROUP_SUPER_MAGIC	0x1021994
-#endif
 #ifndef MQUEUE_SUPER_MAGIC
 # define MQUEUE_SUPER_MAGIC	0x19800202
 #endif