diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-01 14:53:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-01 14:53:27 -0400 |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /drivers/s390 | |
| parent | 10738eeaf4ab3de092586cefcc082e7d43ca0044 (diff) | |
| parent | ec1f1276022e4e3ca40871810217d513e39ff250 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig index dc24ecfac2d1..db2cb1f8a1b5 100644 --- a/drivers/s390/char/Kconfig +++ b/drivers/s390/char/Kconfig | |||
| @@ -105,7 +105,7 @@ config SCLP_ASYNC | |||
| 105 | config HMC_DRV | 105 | config HMC_DRV |
| 106 | def_tristate m | 106 | def_tristate m |
| 107 | prompt "Support for file transfers from HMC drive CD/DVD-ROM" | 107 | prompt "Support for file transfers from HMC drive CD/DVD-ROM" |
| 108 | depends on 64BIT | 108 | depends on S390 && 64BIT |
| 109 | select CRC16 | 109 | select CRC16 |
| 110 | help | 110 | help |
| 111 | This option enables support for file transfers from a Hardware | 111 | This option enables support for file transfers from a Hardware |