From: Dong Jia Shi Date: Mon, 8 Aug 2016 02:27:15 +0000 (+0200) Subject: s390: cio: remove redundant cio_cancel declaration X-Git-Tag: v4.9-rc1~132^2~43 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c29588578edc9ae2c9fae27ff96f443cf39c0f3;p=karo-tx-linux.git s390: cio: remove redundant cio_cancel declaration cio_cancel was declared twice. Remove one of them. Signed-off-by: Dong Jia Shi Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index 93de0b46b489..f0e57aefb5f2 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h @@ -127,7 +127,6 @@ extern int cio_resume (struct subchannel *); extern int cio_halt (struct subchannel *); extern int cio_start (struct subchannel *, struct ccw1 *, __u8); extern int cio_start_key (struct subchannel *, struct ccw1 *, __u8, __u8); -extern int cio_cancel (struct subchannel *); extern int cio_set_options (struct subchannel *, int); extern int cio_update_schib(struct subchannel *sch); extern int cio_commit_config(struct subchannel *sch);