linux-toradex.git/drivers/net/pcmcia, branch v2.6.20.17

modify 3c589_cs to be SMP safe

2007-01-23T05:19:12+00:00

1. EL3WINDOW is always 1 when lock is not held.

2. The second argument of el3_interrupt is 'void *dev_id',
not 'struct el3_private *lp'.

Signed-off-by: komurojun-mbn@nifty.com
Signed-off-by: Jeff Garzik

[PATCH] PCMCIA: fix drivers broken by recent cleanup

2007-01-12T02:24:39+00:00

Setting .ConfigBase and .Present is now done at the pcmcia core.

The driver cleanup missed a few places where the driver did set .Present
to PRESENT_OPTION and later to the values from the CIS.  Setting to
PRESENT_OPTION now overrides the values from the CIS.  So just remove
those lines.

Signed-off-by: Daniel Ritz 
Signed-off-by: Dominik Brodowski 
Signed-off-by: Linus Torvalds

pcnet_cs : add new id

2007-01-09T07:25:37+00:00

pcnet_cs: add new id.
 corega K.K. (CG-LAPCCTXD)
 Logitec LPM-LN10TE

Signed-off-by: Komuro 
Signed-off-by: Jeff Garzik

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

2006-12-06T15:01:18+00:00

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells

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

2006-12-05T14:37:56+00:00

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells

[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

2006-12-05T01:12:02+00:00

struct pcmcia_device *p_dev->conf.ConfigBase and .Present are set in almost
all PCMICA driver right at the beginning, using the same calls but slightly
different implementations. Unfiy this in the PCMCIA core.

Includes a small bugfix ("drivers/net/pcmcia/xirc2ps_cs.c: remove unused
label") from and Signed-off-by Adrian Bunk 

Signed-off-by: Dominik Brodowski

[PATCH] pcmcia: remove prod_id indirection

2006-12-05T01:09:21+00:00

As we read out the product information strings (VERS_1) from the PCMCIA device
in the PCMCIA core, and device drivers can access those reliably in struct
pcmcia_device's fields prod_id[], remove additional product information string
detection logic from PCMCIA device drivers.

Signed-off-by: Dominik Brodowski

[PATCH] pcmcia: remove manf_id and card_id indirection

2006-12-05T01:09:20+00:00

As we read out the manufactor and card_id from the PCMCIA device in the
PCMCIA core, and device drivers can access those reliably in struct
pcmcia_device's fields manf_id and card_id, remove additional (and partly
broken) manf_id and card_id detection logic from PCMCIA device drivers.

Signed-off-by: Dominik Brodowski

[PATCH] network: pcnet_cs: remove the code to change the E8390_CMD register from ei_watchdog()

2006-12-02T05:12:02+00:00

Remove the code to change the E8390_CMD register from ei_watchdog().
The 8390-page is always 0 outside the spin_lock.

Signed-off-by: komurojun-mbn@nifty.com
Signed-off-by: Jeff Garzik

WorkStruct: make allyesconfig

2006-11-22T14:57:56+00:00

Fix up for make allyesconfig.

Signed-Off-By: David Howells