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
This commit is contained in:
Linus Torvalds 2011-10-29 07:29:40 -07:00
commit 249842477c
5 changed files with 5 additions and 0 deletions

View file

@ -0,0 +1 @@
/* empty */

View file

@ -0,0 +1 @@
/* empty */

View file

@ -0,0 +1 @@
/* empty */

View file

@ -0,0 +1 @@
/* empty */

View file

@ -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>