diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
| commit | 508dc4f8eece1a70c493afc6511fdf5934fef567 (patch) | |
| tree | b852a6a5bf9977a33a87158985de02d188ba71d7 /Documentation/pinctrl.txt | |
| parent | 734e9a26d612f64e1c9cfd92256969b773954ae2 (diff) | |
| parent | e3e45c01ae690e65f2650e5288b9af802e95a136 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes because upcoming uprobes changes will rely on it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/pinctrl.txt')
| -rw-r--r-- | Documentation/pinctrl.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index e40f4b4e1977..1479aca23744 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt | |||
| @@ -840,9 +840,9 @@ static unsigned long i2c_pin_configs[] = { | |||
| 840 | 840 | ||
| 841 | static struct pinctrl_map __initdata mapping[] = { | 841 | static struct pinctrl_map __initdata mapping[] = { |
| 842 | PIN_MAP_MUX_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", "i2c0"), | 842 | PIN_MAP_MUX_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", "i2c0"), |
| 843 | PIN_MAP_MUX_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs), | 843 | PIN_MAP_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs), |
| 844 | PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs), | 844 | PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs), |
| 845 | PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs), | 845 | PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs), |
| 846 | }; | 846 | }; |
| 847 | 847 | ||
| 848 | Finally, some devices expect the mapping table to contain certain specific | 848 | Finally, some devices expect the mapping table to contain certain specific |