spi: s3c64xx: fix conflict during updating 4.14.113
authorYoungmin Nam <youngmin.nam@samsung.com>
Thu, 2 May 2019 07:40:26 +0000 (16:40 +0900)
committerYoungmin Nam <youngmin.nam@samsung.com>
Fri, 3 May 2019 04:54:26 +0000 (13:54 +0900)
commitf2003ef9ef51a5ae89814c6061526df3db64fe17
tree7e6c5ca8efaea9890ec4bdd24579df1615a21d00
parentf04738e73d48993ebbdefcc259967be9a704f38b
spi: s3c64xx: fix conflict during updating 4.14.113

Change-Id: I092efcf156874612848f5e40659025a8c4ba5f7f
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
drivers/spi/spi-s3c64xx.c