ARM: S3C24XX: fix merge conflict
Missed some changes during re-sorting this branch.
So fixed it.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
Showing
想要评论请 注册 或 登录
Missed some changes during re-sorting this branch.
So fixed it.
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>