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-samsung | |
| 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-samsung')
| -rw-r--r-- | arch/arm/mach-samsung/include/mach/gpio.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-samsung/include/mach/gpio.h b/arch/arm/mach-samsung/include/mach/gpio.h index 2b4569547e..9e64a841b6 100644 --- a/arch/arm/mach-samsung/include/mach/gpio.h +++ b/arch/arm/mach-samsung/include/mach/gpio.h @@ -23,10 +23,8 @@ # include <mach/iomux-s5pcxx.h> #endif -void gpio_set_value(unsigned, int); -int gpio_direction_input(unsigned); -int gpio_direction_output(unsigned, int); -int gpio_get_value(unsigned); +#include <asm-generic/gpio.h> + void s3c_gpio_mode(unsigned); #endif /* __ASM_MACH_GPIO_H */ |