diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:57:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:57:17 -0400 |
| commit | 9028780a3e6d2c3dd940e89b377765cca008b6df (patch) | |
| tree | 1e72fceedcb72b65e8851d0a56586a699e09ad2e /arch/mips/Kconfig | |
| parent | 5335a40be6867eff986a31bcd8fc82a5cb1e16bb (diff) | |
| parent | e824f7836de25b1c2f659a2412d32227f1f68bcb (diff) | |
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: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 7441a2cf523..b7cb048bc77 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -784,7 +784,6 @@ config TOSHIBA_RBTX4927 | |||
| 784 | select HAS_TXX9_SERIAL | 784 | select HAS_TXX9_SERIAL |
| 785 | select HW_HAS_PCI | 785 | select HW_HAS_PCI |
| 786 | select I8259 | 786 | select I8259 |
| 787 | select ISA | ||
| 788 | select SWAP_IO_SPACE | 787 | select SWAP_IO_SPACE |
| 789 | select SYS_HAS_CPU_TX49XX | 788 | select SYS_HAS_CPU_TX49XX |
| 790 | select SYS_SUPPORTS_32BIT_KERNEL | 789 | select SYS_SUPPORTS_32BIT_KERNEL |
| @@ -806,7 +805,6 @@ config TOSHIBA_RBTX4938 | |||
| 806 | select HAS_TXX9_SERIAL | 805 | select HAS_TXX9_SERIAL |
| 807 | select HW_HAS_PCI | 806 | select HW_HAS_PCI |
| 808 | select I8259 | 807 | select I8259 |
| 809 | select ISA | ||
| 810 | select SWAP_IO_SPACE | 808 | select SWAP_IO_SPACE |
| 811 | select SYS_HAS_CPU_TX49XX | 809 | select SYS_HAS_CPU_TX49XX |
| 812 | select SYS_SUPPORTS_32BIT_KERNEL | 810 | select SYS_SUPPORTS_32BIT_KERNEL |