diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /arch/s390/include/asm/cio.h | |
| parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'arch/s390/include/asm/cio.h')
| -rw-r--r-- | arch/s390/include/asm/cio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index 55bde6035216..ad2b924167d7 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h | |||
| @@ -9,6 +9,8 @@ | |||
| 9 | 9 | ||
| 10 | #define LPM_ANYPATH 0xff | 10 | #define LPM_ANYPATH 0xff |
| 11 | #define __MAX_CSSID 0 | 11 | #define __MAX_CSSID 0 |
| 12 | #define __MAX_SUBCHANNEL 65535 | ||
| 13 | #define __MAX_SSID 3 | ||
| 12 | 14 | ||
| 13 | #include <asm/scsw.h> | 15 | #include <asm/scsw.h> |
| 14 | 16 | ||