diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 06:53:01 +0000 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 06:53:01 +0000 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /drivers/s390/cio/ioasm.h | |
| parent | fb8f7ba077b5c665432082ab205bcd2cb01f6a3c (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
| download | op-kernel-dev-48a7afe314bfc4d7f50e1608632f503dbba7e013.zip op-kernel-dev-48a7afe314bfc4d7f50e1608632f503dbba7e013.tar.gz | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/cio/ioasm.h')
| -rw-r--r-- | drivers/s390/cio/ioasm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h index ad6d829..7153dd9 100644 --- a/drivers/s390/cio/ioasm.h +++ b/drivers/s390/cio/ioasm.h @@ -1,6 +1,7 @@ #ifndef S390_CIO_IOASM_H #define S390_CIO_IOASM_H +#include <asm/chpid.h> #include "schid.h" /* @@ -189,9 +190,9 @@ static inline int chsc(void *chsc_area) return cc; } -static inline int rchp(int chpid) +static inline int rchp(struct chp_id chpid) { - register unsigned int reg1 asm ("1") = chpid; + register struct chp_id reg1 asm ("1") = chpid; int ccode; asm volatile( |
