Commit 24984247 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 18c06353 81397a62

arch/arm/mach-lpc32xx/include/mach/gpio.h

+1 −0
Original line number Diff line number Diff line 
/* empty */

arch/arm/mach-tegra/include/mach/gpio.h

+1 −0
Original line number Diff line number Diff line 
/* empty */

arch/arm/mach-u300/include/mach/gpio.h

+1 −0
Original line number Diff line number Diff line 
/* empty */

arch/arm/mach-vexpress/include/mach/gpio.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/* empty */

include/linux/of.h

+1 −0
Original line number Diff line number Diff line
@@ -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>