From 141430a295cf93d4c5d7e3839f1a0a38986c61a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 16 May 2013 16:17:05 +0200
Subject: [PATCH] 	* grub-core/lib/dtc/libfdt-grub.diff: Remove
 extraneous uintptr_t 	declaration.

---
 ChangeLog                          | 5 +++++
 grub-core/lib/dtc/libfdt-grub.diff | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dedc844b..489088db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/dtc/libfdt-grub.diff: Remove extraneous uintptr_t
+	declaration.
+
 2013-05-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/tests/setjmp_test.c: Ignore missing noreturn.
diff --git a/grub-core/lib/dtc/libfdt-grub.diff b/grub-core/lib/dtc/libfdt-grub.diff
index 173619d0d..e5164a2c8 100644
--- a/grub-core/lib/dtc/libfdt-grub.diff
+++ b/grub-core/lib/dtc/libfdt-grub.diff
@@ -17,13 +17,12 @@ diff -purN libfdt.orig/fdt_rw.c libfdt/fdt_rw.c
 diff -purN libfdt.orig/libfdt_env.h libfdt/libfdt_env.h
 --- libfdt.orig/libfdt_env.h	2011-05-08 20:45:39.000000000 +0100
 +++ libfdt/libfdt_env.h	2012-10-19 16:13:19.051344173 +0100
-@@ -7,6 +7,9 @@
+@@ -7,6 +7,8 @@
  #include <stddef.h>
  #include <stdint.h>
  #include <string.h>
 +#pragma GCC diagnostic ignored "-Wcast-align"
 +#pragma GCC diagnostic ignored "-Wsign-compare"
-+typedef grub_addr_t uintptr_t;
  
  #define _B(n)	((unsigned long long)((uint8_t *)&x)[n])
  static inline uint32_t