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

Commit 9028780a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 



* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits)
  [netdrvr] atl1: fix build
  pasemi_mac: Use local-mac-address instead of mac-address if available
  pasemi_mac: PHY support
  pasemi_mac: Add msglevel support and "debug" module param
  pasemi_mac: Logic cleanup / rx performance improvements
  pasemi_mac: Minor cleanup / define fixes
  pasemi_mac: Add SKB reuse / copy-break
  pasemi_mac: Timer and interrupt fixes
  pasemi_mac: Abstract and fix up interrupt restart routines
  pasemi_mac: Move the IRQ mapping from the PCI layer to the driver
  tc35815: Remove unnecessary skb->dev assignment
  drivers/net/dm9000: Convert to generic boolean
  AT91RM9200 Ethernet: Fix multicast addressing
  AT91RM9200 Ethernet: Support additional PHYs
  PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code
  sky2: re-enable 88E8056 for most motherboards
  MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX
  ne: MIPS: Use platform_driver for ne on RBTX49XX
  ne: Add NEEDS_PORTLIST to control ISA auto-probe
  ne: Misc fixes for platform driver.
  ...

Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to
of_get_property()) manually.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parents 5335a40b e824f783

arch/mips/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ config TOSHIBA_RBTX4927 
	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select I8259

	select ISA

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -806,7 +805,6 @@ config TOSHIBA_RBTX4938 
	select HAS_TXX9_SERIAL

	select HW_HAS_PCI

	select I8259

	select ISA

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_TX49XX

	select SYS_SUPPORTS_32BIT_KERNEL

arch/mips/configs/rbhma4500_defconfig

+0 −31
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

CONFIG_HW_HAS_PCI=y

CONFIG_PCI=y

CONFIG_ISA=y

CONFIG_MMU=y



#
@@ -573,7 +572,6 @@ CONFIG_MTD_CFI_UTIL=y 
#

# Plug and Play support

#

# CONFIG_PNP is not set

# CONFIG_PNPACPI is not set



#
@@ -658,7 +656,6 @@ CONFIG_BLK_DEV_IT8213=m 
# CONFIG_BLK_DEV_VIA82CXXX is not set

CONFIG_BLK_DEV_TC86C001=m

# CONFIG_IDE_ARM is not set

# CONFIG_IDE_CHIPSETS is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set

# CONFIG_IDEDMA_AUTO is not set
@@ -676,11 +673,6 @@ CONFIG_RAID_ATTRS=m 
#

# CONFIG_ATA is not set



#

# Old CD-ROM drivers (not SCSI, not IDE)

#

# CONFIG_CD_NO_IDESCSI is not set



#

# Multi-device support (RAID and LVM)

#
@@ -742,37 +734,20 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_SMC is not set

# CONFIG_DM9000 is not set

# CONFIG_NET_VENDOR_RACAL is not set



#

# Tulip family network device support

#

# CONFIG_NET_TULIP is not set

# CONFIG_AT1700 is not set

# CONFIG_DEPCA is not set

# CONFIG_HP100 is not set

CONFIG_NET_ISA=y

# CONFIG_E2100 is not set

# CONFIG_EWRK3 is not set

# CONFIG_EEXPRESS is not set

# CONFIG_EEXPRESS_PRO is not set

# CONFIG_HPLAN_PLUS is not set

# CONFIG_HPLAN is not set

# CONFIG_LP486E is not set

# CONFIG_ETH16I is not set

CONFIG_NE2000=y

# CONFIG_SEEQ8005 is not set

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_AC3200 is not set

# CONFIG_APRICOT is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

# CONFIG_CS89x0 is not set

# CONFIG_DGRS is not set

# CONFIG_EEPRO100 is not set

# CONFIG_E100 is not set
@@ -833,8 +808,6 @@ CONFIG_NET_RADIO=y 
# Obsolete Wireless cards support (pre-802.11)

#

# CONFIG_STRIP is not set

# CONFIG_ARLAN is not set

# CONFIG_WAVELAN is not set



#

# Wireless 802.11b ISA/PCI cards support
@@ -920,9 +893,6 @@ CONFIG_KEYBOARD_ATKBD=y 
CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_INPORT is not set

# CONFIG_MOUSE_LOGIBM is not set

# CONFIG_MOUSE_PC110PAD is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -1072,7 +1042,6 @@ CONFIG_FB_ATY_CT=y 
#

CONFIG_VGA_CONSOLE=y

# CONFIG_VGACON_SOFT_SCROLLBACK is not set

# CONFIG_MDA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

# CONFIG_FRAMEBUFFER_CONSOLE is not set

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c

+19 −0
Original line number Diff line number Diff line
@@ -1049,3 +1049,22 @@ static int __init toshiba_rbtx4927_rtc_init(void) 
	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(toshiba_rbtx4927_rtc_init);



static int __init rbtx4927_ne_init(void)

{

	static struct resource __initdata res[] = {

		{

			.start	= RBTX4927_RTL_8019_BASE,

			.end	= RBTX4927_RTL_8019_BASE + 0x20 - 1,

			.flags	= IORESOURCE_IO,

		}, {

			.start	= RBTX4927_RTL_8019_IRQ,

			.flags	= IORESOURCE_IRQ,

		}

	};

	struct platform_device *dev =

		platform_device_register_simple("ne", -1,

						res, ARRAY_SIZE(res));

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(rbtx4927_ne_init);

arch/mips/tx4938/toshiba_rbtx4938/setup.c

+20 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/console.h>

#include <linux/pci.h>

#include <linux/pm.h>

#include <linux/platform_device.h>



#include <asm/wbflush.h>

#include <asm/reboot.h>
@@ -1037,3 +1038,22 @@ static int __init tx4938_spi_proc_setup(void) 


__initcall(tx4938_spi_proc_setup);

#endif



static int __init rbtx4938_ne_init(void)

{

	struct resource res[] = {

		{

			.start	= RBTX4938_RTL_8019_BASE,

			.end	= RBTX4938_RTL_8019_BASE + 0x20 - 1,

			.flags	= IORESOURCE_IO,

		}, {

			.start	= RBTX4938_RTL_8019_IRQ,

			.flags	= IORESOURCE_IRQ,

		}

	};

	struct platform_device *dev =

		platform_device_register_simple("ne", -1,

						res, ARRAY_SIZE(res));

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(rbtx4938_ne_init);

arch/powerpc/platforms/pasemi/pci.c

+0 −13
Original line number Diff line number Diff line
@@ -173,19 +173,6 @@ static void __init pas_fixup_phb_resources(void) 
}





void __devinit pas_pci_irq_fixup(struct pci_dev *dev)

{

	/* DMA is special, 84 interrupts (128 -> 211), all but 128

	 * need to be mapped by hand here.

	 */

	if (dev->vendor == 0x1959 && dev->device == 0xa007) {

		int i;

		for (i = 129; i < 212; i++)

			irq_create_mapping(NULL, i);

	}

}





void __init pas_pci_init(void)

{

	struct device_node *np, *root;