]> git.baikalelectronics.ru Git - kernel.git/commit
s390/cio: fix multiple structure definitions
authorSebastian Ott <sebott@linux.vnet.ibm.com>
Wed, 7 May 2014 11:27:21 +0000 (13:27 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 20 May 2014 06:58:53 +0000 (08:58 +0200)
commitd78820f8ee1397dfdc92a952e9377aa0cdce66ea
treef3c8fc9a1199da5a2d0426cc509d145097c22894
parent818f7d8a1eab9fc9835bc8dcebe5da0f6a8dc7f7
s390/cio: fix multiple structure definitions

Fix multiple definitions of struct channel_path_desc by moving it
to asm/chpid.h . Also change ccw_device_get_chp_desc to use proper
types.

Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/include/asm/ccwdev.h
arch/s390/include/asm/chpid.h
drivers/s390/cio/chp.c
drivers/s390/cio/chp.h
drivers/s390/cio/chsc.h
drivers/s390/cio/device_ops.c
drivers/s390/net/qeth_core_main.c