aboutsummaryrefslogtreecommitdiff
path: root/include/linux/fpga/fpga-mgr.h
diff options
context:
space:
mode:
authorAndreas Faerber <[email protected]>2015-03-18 01:25:18 +0900
committerKukjin Kim <[email protected]>2015-03-18 01:25:44 +0900
commit7e9e20b1faab02357501553d7f4e3efec1b4cfd3 (patch)
treeb2b6cc25407d5dc21054279a0bf2ddada60913c5 /include/linux/fpga/fpga-mgr.h
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
ARM: dts: fix mmc node updates for exynos5250-spring
Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: unuse the slot-node and deprecate the supports-highspeed for dw-mmc in exynos") by dropping the slot@0 nodes, moving its bus-width property to the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, matching exynos5250-snow. Cc: Jaehoon Chung <[email protected]> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") Signed-off-by: Andreas Faerber <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Cc: <[email protected]> [3.19+] Signed-off-by: Kukjin Kim <[email protected]>
Diffstat (limited to 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions