diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 14:25:06 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 14:25:06 (GMT) |
commit | f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 (patch) | |
tree | 7800081c5cb16a4dfee1e57a70f3be90f7b50d9a /include/linux/mfd/max77693.h | |
parent | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 (diff) | |
parent | 1b3c393cd43f22ead8a6a2f839efc6df8ebd7465 (diff) | |
download | linux-fsl-qoriq-f0b9abfb044649bc452fb2fb975ff2fd599cc6a3.tar.xz |
Merge branch 'linus' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mfd/max77693.h')
-rw-r--r-- | include/linux/mfd/max77693.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h index 1d28ae9..fe03b2d 100644 --- a/include/linux/mfd/max77693.h +++ b/include/linux/mfd/max77693.h @@ -30,7 +30,20 @@ #ifndef __LINUX_MFD_MAX77693_H #define __LINUX_MFD_MAX77693_H +struct max77693_reg_data { + u8 addr; + u8 data; +}; + +struct max77693_muic_platform_data { + struct max77693_reg_data *init_data; + int num_init_data; +}; + struct max77693_platform_data { int wakeup; + + /* muic data */ + struct max77693_muic_platform_data *muic_data; }; #endif /* __LINUX_MFD_MAX77693_H */ |