diff options
author | 2013-06-24 15:20:26 -0700 | |
---|---|---|
committer | 2013-06-24 15:20:26 -0700 | |
commit | f797d37ead9afc9b5586f02789819a8fb72a55fc (patch) | |
tree | 8278cc2cdb32d5aabfab919e79afe56774618b8d /Documentation/devicetree | |
parent | usb: check usb_hub_to_struct_hub() return value (diff) | |
parent | Linux 3.10-rc7 (diff) | |
download | linux-dev-f797d37ead9afc9b5586f02789819a8fb72a55fc.tar.xz linux-dev-f797d37ead9afc9b5586f02789819a8fb72a55fc.zip |
Merge 3.10-rc7 into usb-next
We want the USB fixes and other good stuff in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/media/exynos-fimc-lite.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt index 3f62adfb3e0b..de9f6b78ee51 100644 --- a/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt +++ b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt @@ -2,7 +2,7 @@ Exynos4x12/Exynos5 SoC series camera host interface (FIMC-LITE) Required properties: -- compatible : should be "samsung,exynos4212-fimc" for Exynos4212 and +- compatible : should be "samsung,exynos4212-fimc-lite" for Exynos4212 and Exynos4412 SoCs; - reg : physical base address and size of the device memory mapped registers; |