Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b656cc64 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 's390-next' 



Ursula Braun says:

====================
s390: network patches for net-next

here are some s390 related patches for net-next
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 74abc20c 8b7ac017

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -8328,7 +8328,6 @@ F: block/partitions/ibm.c 


S390 NETWORK DRIVERS

M:	Ursula Braun <ursula.braun@de.ibm.com>

M:	Frank Blaschka <blaschka@linux.vnet.ibm.com>

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

arch/s390/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = { 
	{.irq = IRQIO_TAP,  .name = "TAP", .desc = "[I/O] Tape"},

	{.irq = IRQIO_VMR,  .name = "VMR", .desc = "[I/O] Unit Record Devices"},

	{.irq = IRQIO_LCS,  .name = "LCS", .desc = "[I/O] LCS"},

	{.irq = IRQIO_CLW,  .name = "CLW", .desc = "[I/O] CLAW"},

	{.irq = IRQIO_CTC,  .name = "CTC", .desc = "[I/O] CTC"},

	{.irq = IRQIO_APB,  .name = "APB", .desc = "[I/O] AP Bus"},

	{.irq = IRQIO_ADM,  .name = "ADM", .desc = "[I/O] EADM Subchannel"},

drivers/s390/net/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -57,17 +57,6 @@ config SMSGIUCV_EVENT 


	  To compile as a module, choose M. The module name is "smsgiucv_app".



config CLAW

	def_tristate m

	prompt "CLAW device support"

	depends on CCW && NETDEVICES

	help

	  This driver supports channel attached CLAW devices.

	  CLAW is Common Link Access for Workstation.  Common devices

          that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.

	  To compile as a module, choose M. The module name is claw.

	  To compile into the kernel, choose Y.



config QETH

	def_tristate y

	prompt "Gigabit Ethernet device support"
@@ -106,6 +95,6 @@ config QETH_IPV6 


config CCWGROUP

	tristate

	default (LCS || CTCM || QETH || CLAW)

	default (LCS || CTCM || QETH)



endmenu

drivers/s390/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o 
obj-$(CONFIG_SMSGIUCV) += smsgiucv.o

obj-$(CONFIG_SMSGIUCV_EVENT) += smsgiucv_app.o

obj-$(CONFIG_LCS) += lcs.o

obj-$(CONFIG_CLAW) += claw.o

qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o

obj-$(CONFIG_QETH) += qeth.o

qeth_l2-y += qeth_l2_main.o qeth_l2_sys.o