diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
| commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
| tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /arch/s390/include/asm/cio.h | |
| parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| download | blackbird-obmc-linux-459d2a9f5fcf125ba736f7843189ccdfba11b1ff.tar.gz blackbird-obmc-linux-459d2a9f5fcf125ba736f7843189ccdfba11b1ff.zip | |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
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 @@ #define LPM_ANYPATH 0xff #define __MAX_CSSID 0 +#define __MAX_SUBCHANNEL 65535 +#define __MAX_SSID 3 #include <asm/scsw.h> |
