merge of 2510e5252ac32a4848eb302514a1d35602ed7afd

     and 65b0cd64eeef02b789460148d6bb958749417f11

1 files changed, 0 insertions, 40 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch
deleted file mode 100644
index 9fe3bd06d3..0000000000
--- a/packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
-Patch was sent upstream to Marcel Holtmann <marcel@holtmann.org>
-
-Response:
-
-Hi Marcin,
-
-> I use Socket Bluetooth CompactFlash card in my Zaurus. Some time ago we 
-> switched to 2.6.12-rcX-mmY so we get PCMCIA hotplug support. On my device 
-> I also switched from pcmcia-cs 3.2.8 to pcmciautils 003 (will check 005 
-> later).
-> 
-> With my config I lost automatic module loading after BT card insert so I 
-> looked into kernel driver and added infos about my card. Patch attached.
-
-there are some pending patches from Dominic that I want to see merged
-mainline first, before I am going to submit patches for the Bluetooth
-PCMCIA drivers.
-
-> BTW - any plans on adding suspend/resume support into this driver? Now I 
-> have to eject/insert card after resume and restart bluez-utils to get it 
-> working.
-
-Maybe with the new PCMCIA subsystem this will be possible. Feel free to
-send in patches.
-
-Regards
-
-Marcel
-
---- linux-2.6.12/drivers/bluetooth/dtl1_cs.c.orig	2005-07-05 11:19:50.000000000 +0200
-+++ linux-2.6.12/drivers/bluetooth/dtl1_cs.c	2005-07-05 11:19:51.000000000 +0200
-@@ -810,6 +810,7 @@
- static struct pcmcia_device_id dtl1_ids[] = {
- 	PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
- 	PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
-+	PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3),
- 	PCMCIA_DEVICE_NULL
- };
- MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);