diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 01:41:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 01:41:27 -0400 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /include/linux/libfdt.h | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
Merge 3.7-rc1 into tty-linus
This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/libfdt.h')
| -rw-r--r-- | include/linux/libfdt.h | 4 |
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 @@ | |||
| 2 | #define _INCLUDE_LIBFDT_H_ | 2 | #define _INCLUDE_LIBFDT_H_ |
| 3 | 3 | ||
| 4 | #include <linux/libfdt_env.h> | 4 | #include <linux/libfdt_env.h> |
| 5 | #include <> | 5 | #include "../../scripts/dtc/libfdt/fdt.h" |
| 6 | #include <> | 6 | #include "../../scripts/dtc/libfdt/libfdt.h" |
| 7 | 7 | ||
| 8 | #endif /* _INCLUDE_LIBFDT_H_ */ | 8 | #endif /* _INCLUDE_LIBFDT_H_ */ |