diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
| commit | 0b37fbf7508ff30e1d3668fea74e82f842448354 (patch) | |
| tree | 6d01fee5e95e1d4a8042ef473d61dd816b43d13e /include/linux/platform_data/ds2482.h | |
| parent | 0a37d59e3c8c2299f8931df0cb1c0f525047fab5 (diff) | |
| parent | a88f9e27498afaea615ad3e93af4f26df1f84987 (diff) | |
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
kernel/futex.c
Diffstat (limited to 'include/linux/platform_data/ds2482.h')
| -rw-r--r-- | include/linux/platform_data/ds2482.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/platform_data/ds2482.h b/include/linux/platform_data/ds2482.h new file mode 100644 index 00000000000..5a6879e2a09 --- /dev/null +++ b/include/linux/platform_data/ds2482.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2012 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __PLATFORM_DATA_DS2482__ +#define __PLATFORM_DATA_DS2482__ + +struct ds2482_platform_data { + int slpz_gpio; +}; + +#endif /* __PLATFORM_DATA_DS2482__ */ |