diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:22:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:22:35 +0200 |
| commit | 2d05bf6ef7391ac3642ab62bc3a649fdb32731fe (patch) | |
| tree | a8671f0eafa885b4f3ad05204e3ed642b6acab59 /include/linux/gpio.h | |
| parent | 9c63cd5a955ce8a3de1776a9e4b6b89c69b2a09e (diff) | |
| parent | 8c0383b8f6a8012b107cd62eaa5a556586d8ea56 (diff) | |
| download | olio-linux-3.10-2d05bf6ef7391ac3642ab62bc3a649fdb32731fe.tar.xz olio-linux-3.10-2d05bf6ef7391ac3642ab62bc3a649fdb32731fe.zip | |
Merge branch 'samsung/defconfig' into next/defconfig
From Kukjin Kim <kgene.kim@samsung.com>:
It is including new exynos_defconfig for DT configuration of exynos4
and exynos5 together. The old exynos4_defconfig will be used for non-DT
for a while and we will try to move on using exynos_defconfig for only DT.
* samsung/defconfig:
ARM: exynos_defconfig: enable more platforms in defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/gpio.h')
| -rw-r--r-- | include/linux/gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index f07fc2d0815..2e31e8b3a19 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -22,8 +22,8 @@ /* Gpio pin is open source */ #define GPIOF_OPEN_SOURCE (1 << 3) -#define GPIOF_EXPORT (1 << 2) -#define GPIOF_EXPORT_CHANGEABLE (1 << 3) +#define GPIOF_EXPORT (1 << 4) +#define GPIOF_EXPORT_CHANGEABLE (1 << 5) #define GPIOF_EXPORT_DIR_FIXED (GPIOF_EXPORT) #define GPIOF_EXPORT_DIR_CHANGEABLE (GPIOF_EXPORT | GPIOF_EXPORT_CHANGEABLE) |