diff options
| author | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-04-10 01:49:29 +0400 |
| commit | e86c4b67feb2c984314eef71314f26cfe39fef36 (patch) | |
| tree | 3c5a7e2216cdcd1d06b8729bf94eba6dc74a7959 /include/dt-bindings | |
| parent | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (diff) | |
| parent | 9c602629e34bad88a464e08de08118e80beee0d8 (diff) | |
| download | linux-e86c4b67feb2c984314eef71314f26cfe39fef36.tar.xz | |
Merge tag 'xtensa-for-next-20140406' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Merging from Max' tree.
Xtensa fixes for 3.15:
- add missing cache manipulation symbol exports to fix build failures;
- sort extable at build time;
- clean up sysmem code, support memmap boot parameter;
- add highmem support for cores with non-aliasing caches;
- add DTS for xtfpga on KC705.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/tegra124-car.h b/include/dt-bindings/clock/tegra124-car.h index a1116a3b54ef..8c1603b10665 100644 --- a/include/dt-bindings/clock/tegra124-car.h +++ b/include/dt-bindings/clock/tegra124-car.h @@ -36,10 +36,10 @@ #define TEGRA124_CLK_PWM 17 #define TEGRA124_CLK_I2S2 18 /* 20 (register bit affects vi and vi_sensor) */ -#define TEGRA124_CLK_GR_2D 21 +/* 21 */ #define TEGRA124_CLK_USBD 22 #define TEGRA124_CLK_ISP 23 -#define TEGRA124_CLK_GR_3D 24 +/* 26 */ /* 25 */ #define TEGRA124_CLK_DISP2 26 #define TEGRA124_CLK_DISP1 27 |