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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c
parents 1dc0f3c5 4b8fe663

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5943,7 +5943,6 @@ F: include/linux/tty.h 


TULIP NETWORK DRIVERS

M:	Grant Grundler <grundler@parisc-linux.org>

M:	Kyle McMartin <kyle@mcmartin.ca>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/tulip/

drivers/atm/adummy.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static int __init adummy_init(void) 
		err = -ENOMEM;

		goto out;

	}

	atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);

	atm_dev = atm_dev_register(DEV_LABEL, NULL, &adummy_ops, -1, NULL);

	if (!atm_dev) {

		printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");

		err = -ENODEV;

drivers/atm/ambassador.c

+2 −1
Original line number Diff line number Diff line
@@ -2244,7 +2244,8 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ 
		goto out_reset;

	}



	dev->atm_dev = atm_dev_register (DEV_LABEL, &amb_ops, -1, NULL);

	dev->atm_dev = atm_dev_register (DEV_LABEL, &pci_dev->dev, &amb_ops, -1,

					 NULL);

	if (!dev->atm_dev) {

		PRINTD (DBG_ERR, "failed to register Madge ATM adapter");

		err = -EINVAL;

drivers/atm/atmtcp.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static int atmtcp_create(int itf,int persist,struct atm_dev **result) 
	if (!dev_data)

		return -ENOMEM;



	dev = atm_dev_register(DEV_LABEL,&atmtcp_v_dev_ops,itf,NULL);

	dev = atm_dev_register(DEV_LABEL,NULL,&atmtcp_v_dev_ops,itf,NULL);

	if (!dev) {

		kfree(dev_data);

		return itf == -1 ? -ENOMEM : -EBUSY;

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -2244,7 +2244,7 @@ static int __devinit eni_init_one(struct pci_dev *pci_dev, 
		    &zeroes);

		if (!cpu_zeroes) goto out1;

	}

	dev = atm_dev_register(DEV_LABEL,&ops,-1,NULL);

	dev = atm_dev_register(DEV_LABEL, &pci_dev->dev, &ops, -1, NULL);

	if (!dev) goto out2;

	pci_set_drvdata(pci_dev, dev);

	eni_dev->pci_dev = pci_dev;