mmc-utils: fix linux headers issue before 3-4

With toolchains that include linux kernel headers before the 3.4 kernel,
an issue exists with linux/mmc/ioctl.h in that it doesn't include
linux/types.h.

Merged the patch with an existing patch for mmc-utils as it modifies
the same file and fixes similar issues. Also updated the patch to
conform to the buildroot patch naming standard.

Fixes:
  http://autobuild.buildroot.net/results/828/828c7a686736710c4fcb152230d0fa6b5f4d6ad3

Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch b/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch
deleted file mode 100644 (file)
index 07dc742..0000000
--- a/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-mmc-utils: Fix 64-bit values redefinition
-
-Some toolchains include asm-generic/int-l64.h from their asm/types.h
-file for certain 64-bit architectures. This causes a conflict between
-types like this one:
-
-asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
- typedef __signed__ long __s64;
-            ^
-In file included from mmc.h:17:0,
-        from mmc_cmds.c:30:
-asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
-here
- __extension__ typedef __signed__ long long __s64;
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- mmc.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/mmc.h b/mmc.h
-index 9871d62..2d54ec5 100644
---- a/mmc.h
-+++ b/mmc.h
-@@ -14,9 +14,11 @@
-  * Boston, MA 021110-1307, USA.
-  */
- 
--#include <asm-generic/int-ll64.h>
- #include <linux/mmc/ioctl.h>
- #include <stdio.h>
-+#ifndef _ASM_GENERIC_INT_L64_H
-+#include <asm-generic/int-ll64.h>
-+#endif
- 
- #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } }
- 
--- 
-1.7.1
-

diff --git a/package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch b/package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch
new file mode 100644 (file)
index 0000000..8d0b2eb
--- /dev/null
+++ b/package/mmc-utils/mmc-utils-001-fix-mmc-h-includes.patch
@@ -0,0 +1,41 @@
+mmc-utils: fix mmc.h includes
+
+Some toolchains include asm-generic/int-l64.h from their asm/types.h
+file for certain 64-bit architectures. This causes a conflict between
+types like this one:
+
+asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
+ typedef __signed__ long __s64;
+            ^
+In file included from mmc.h:17:0,
+        from mmc_cmds.c:30:
+asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
+here
+ __extension__ typedef __signed__ long long __s64;
+
+[Ryan: added include of linux/types.h because mmc/ioctl.h does not
+       include it in kernel version before 3.4]
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Signed-off-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
+---
+ mmc.h |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+diff --git a/mmc.h b/mmc.h
+index 9871d62..2d54ec5 100644
+--- a/mmc.h
++++ b/mmc.h
+@@ -14,9 +14,12 @@
+  * Boston, MA 021110-1307, USA.
+  */
+
+-#include <asm-generic/int-ll64.h>
++#include <linux/types.h>
+ #include <linux/mmc/ioctl.h>
+ #include <stdio.h>
++#ifndef _ASM_GENERIC_INT_L64_H
++#include <asm-generic/int-ll64.h>
++#endif
+
+ #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } }
+