From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/net/ne2.c does not compile without CONFIG_MCA_LEGACY set.

As CONFIG_MCA_LEGACY depends on CONFIG_MCA, we can use only
CONFIG_MCA_LEGACY, insteed of "MCA && MCA_LEGACY".
Signed-off-by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/net/at1700.c does not compile without CONFIG_MCA_LEGACY set.

As CONFIG_MCA_LEGACY depends on CONFIG_MCA, we can use only
CONFIG_MCA_LEGACY, insteed of "MCA && MCA_LEGACY".
Signed-off-by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Change the pcnet32 driver to use module_param and module_param_array.

The pcnet32 driver was not correctly enabling MII autonegotiation after
booting when ppc firmware forced the speed/duplex mode of the chip.
After several conversations with AMD this patch corrects the problem.

I have tested this on hardware I have available (ia32 and ppc64) but I
would like wider audience testing of this patch.
Signed-off-by: Don Fry <brazilnut@us.ibm.com>

This patch adds a module parameter to select HomePNA mode of operation for
the 79C978 version of the pcnet32.  Tested ia32 and ppc64.
signed-off-by: Patrick Simmons <psimmons@flash.net>
signed-off-by: Don Fry <brazilnut@us.ibm.com>

A recent change I made broke pcnet32 in a way that allowed real hardware
to work, but broke VMWare.  This patch acknowledges all interrupts early
in the pcnet32_interrupt while loop.  Without this patch on real hardware
the first transmit operation would clear the 'init' interrupt, but in
VMWare it would rain interrupts.  Keith Moore did more testing for me
on VMWare and I did a better job testing on hardware.  Petr Vandrovec
correctly pointed out the source of the problem on lkml.

This patch is not needed for 2.4.27-rc1 unless my patch labeled
"pcnet32: recover after rx hang" is applied (which it has not).
signed-off-by: Don Fry <brazilnut@us.ibm.com>

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Use set_pci_mwi()

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Don't poke around in the timeout registers

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Clean up the device table

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Fix a thinko by me

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Missing error check after dev_alloc_skb

2004-06-28 Margit Schubert-While <margitsw@t-online.de>

* Clean up function definitions (missing static, extraneous inline)

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Nicolas Pitre

Missing prototype.

Patch from Nicolas Pitre

... and a comment fix in bonus

Patch from Tony Lindgren

Removes some dead code as noted by Russell King.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Signed-off-by: Kris Kersey <augustus@linuxhardware.org>
Signed-off-by: Dave Jones <davej@redhat.com>

Signed-off-by: Dave Jones <davej@redhat.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Use NULL, not 0, where appropriate.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

- Remove 'arc' machine name from Makefile
- clk_set_rate() should return non-zero atm.
- proc-sa1100.S doesn't need asm/ptrace.h
- update mach-types
- kill line of spaces in clock.h

Generate SIZEOF_MACHINE_DESC using asm-offsets method rather than
relying on people updating the definition in asm/mach/arch.h

This places arch_adjust_zones along side ISA_DMA_THRESHOLD.  These
two are related, but having them in separate files means its not
obvious that they are.

ISA_DMA_THRESHOLD is a DMA mask which must be defined such that it
matches the memory handed out by GFP_DMA, which in turn is controlled
by arch_adjust_zones.

This allows machine classes to override ISA_DMA_THRESHOLD as
necessary.

Clean up bzImage target, remove a couple of obsolete testing targets,
and add better bootpImage help text.

This fixes the buggy decompressor assembly, and fixes PCMCIA IO
to use the correct byte lane when accessing certain PCMCIA cards.

Static data causes GOTOFF relocations to be used, which won't work
because we want to relocate the .data section separately from the
.text section.  Therefore, force all data to be nonstatic.

- use 'Image' target for kernel image to be compressed rather than
  duplicating its generation.
- use .incbin-based generation of ELF objects from binary data rather
  than 'ld'-based generation.