diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:34 +0100 |
commit | daac8bf5d3bd5e157c66d753eac0d5efb47aa145 (patch) | |
tree | d599de85cebf7ab3da97e0275dbf1b40399e1943 /arch/arm/mach-versatile/include | |
parent | 2f5cd8571912689900651a17297ee5e8ed2bb816 (diff) | |
parent | 33f59d8a81b4f870239b79ef274609b964292f84 (diff) | |
download | barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.gz barebox-daac8bf5d3bd5e157c66d753eac0d5efb47aa145.tar.xz |
Merge branch 'for-next/bcm2835'
Conflicts:
arch/arm/configs/versatilepb_defconfig
Diffstat (limited to 'arch/arm/mach-versatile/include')
-rw-r--r-- | arch/arm/mach-versatile/include/mach/gpio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/include/mach/gpio.h b/arch/arm/mach-versatile/include/mach/gpio.h new file mode 100644 index 0000000000..306ab4c9f2 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/gpio.h @@ -0,0 +1 @@ +#include <asm-generic/gpio.h> |