aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libfdt.h
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2012-10-05 10:45:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 02:48:09 +0900
commit67966e088b0c7dc926f4ce19565ebf208e18d058 (patch)
tree8e7b5bae0e86c670f6fe5ee9d7d0e5bf038c0a9b /include/linux/libfdt.h
parentMerge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 (diff)
downloadlinux-dev-67966e088b0c7dc926f4ce19565ebf208e18d058.tar.xz
linux-dev-67966e088b0c7dc926f4ce19565ebf208e18d058.zip
Partially revert a1ce39288e6fbef (UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers)
Syntax errors were introduced into include/linux/libfdt.h by the offending commit, revert the changes made to this file. The kernel again compiles, thus restoring harmony and balance to the universe. Signed-off-by: David Daney <david.daney@cavium.com> Cc: David Howells <dhowells@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/libfdt.h')
-rw-r--r--include/linux/libfdt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/libfdt.h b/include/linux/libfdt.h
index a0c3bf6c9edb..4c0306c69b4e 100644
--- a/include/linux/libfdt.h
+++ b/include/linux/libfdt.h
@@ -2,7 +2,7 @@
#define _INCLUDE_LIBFDT_H_
#include <linux/libfdt_env.h>
-#include <>
-#include <>
+#include "../../scripts/dtc/libfdt/fdt.h"
+#include "../../scripts/dtc/libfdt/libfdt.h"
#endif /* _INCLUDE_LIBFDT_H_ */