diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 14:29:40 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 14:29:40 (GMT) |
| commit | 249842477c589ea29ff161ace9c8666d96e9883a (patch) | |
| tree | 5b041a3a703fe9c5040835b27c4a727009a242db /include | |
| parent | 18c0635363364ca2fc2d1cbd65bbf918daf89d1a (diff) | |
| parent | 81397a625d063403d80a25bba00fa1cb6d7e04f5 (diff) | |
| download | linux-249842477c589ea29ff161ace9c8666d96e9883a.tar.xz | |
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
ARM: mark empty gpio.h files empty
gpio: Fix ARM versatile-express build failure
of: include errno.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 92c40a1..5dbe263 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -17,6 +17,7 @@ */ #include <linux/types.h> #include <linux/bitops.h> +#include <linux/errno.h> #include <linux/kref.h> #include <linux/mod_devicetable.h> #include <linux/spinlock.h> |