Minor nits and extra devices:

o use ata2 consistanty, even though it doesn't matter too much
o SunDisk (aka SanDisk) SDP's need a different config to actualy work
  (tested on the 10M part) by me.
o Non-name ata card.
o WIT IDE controller
o IBM FLASH card
o Megahert 28.8 cellular modem that I thought I'd added before.
o LinkMake LM 336 combo modem/fax.

Submitted by various people and gleaned from the nomads and mobile
mailing lists, but I've lost the names.  I'm sorry.

2 files changed, 78 insertions, 14 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 28b780f..6aa7226 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -59,6 +59,14 @@ card "Cabletron" "RoamAbout 802.11 DS"
 	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
+# LinkMates LM 336 LAN Fax/Modem PC Card
+card "PCMCIAs" "ComboCard"
+	config	0x24 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s LinkMates LM 336 removed
+	remove	/sbin/ifconfig $device delete
+
 # IBM PCMCIA Ethernet I/II
 card "IBM Corp." "Ethernet"
 	config	0x1 "ed0" ?
@@ -376,6 +384,12 @@ card "MEGAHERTZ" "XJ2288"
 	insert	logger -t pccard:$device -s Megahertz XJ2288 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ2288 removed
 
+# Megahertz XJ-CC4288
+card "Megahertz" "XJ-CC4288"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz XJ-CC4288 inserted
+	remove	logger -t pccard:$device -s Megahertz XJ-CC4288 removed
+
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
 	config	0x22 "sio2" ?
@@ -625,45 +639,63 @@ card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
 #	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
 #	remove	logger -t pccard:$device -s Panasonic FM radio card removed
 
+# IO Data CBIDE (bundled with CDP-FX24, etc.)
+card "WIT" "IDE16"
+	config	auto "ata0" ?
+	insert	logger -t pccard:$device -s IO Data CBIDE inserted
+	remove	logger -t pccard:$device -s IO Data CBIDE removed
+
+# IBM Flash ATA (Ricoh Flash ATA 10MB)
+card "IBM" "IBM17JSSFP10"
+	config	auto "ata0" ? iosize 16
+	insert	logger -t pccard:$device -s IBM Flash ATA inserted
+	remove	logger -t pccard:$device -s IBM flash ATA removed
+
+# Non-brand Compact Flash Card(32MB)
+card "       " "KCF 32M"
+	config	0x1 "ata2" ? iosize 16
+	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
+	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
+
 # SunDisk Flash ATA
 # (OEM: Epson Flash Packer)
 card "SunDisk" "SDP5"
-	config	0x3 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
 	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
 
 card "SunDisk" "SDP"
-	config	0x3 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
 	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
 
 # Midori Elec Fast Flash
 card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata1" ?
+	config	0x3  "ata2" ?
 	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
 	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
 
 # Simple Technology ata flash
 card "Simple Technology        " "STI-ATA"
-	config	0x2 "ata0" ?
+	config	0x2 "ata2" ?
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
 	
 # Viking ATA Flash card
 card "VIKING ATA/CF FLASH CARD " "TOR/AM "
-	config	0x2 "ata0" ?
+	config	0x2 "ata2" ?
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
 	
 # Maxtor 131MB Type III HDD
 card "Maxtor" "MXL131"
-	config	0x03 "ata1" ?
+	config	0x03 "ata2" ?
 	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
 	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
 
 # SiliconTech, Inc flash card
 card "SiliconTech,Inc" "16MB Compact PC Card"
-	config	0x1 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
 	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed
 
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index 28b780f..6aa7226 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -59,6 +59,14 @@ card "Cabletron" "RoamAbout 802.11 DS"
 	remove	logger -t pccard:$device -s WaveLAN/IEEE removed
 	remove	/sbin/ifconfig $device delete
 
+# LinkMates LM 336 LAN Fax/Modem PC Card
+card "PCMCIAs" "ComboCard"
+	config	0x24 "ed0" ? 0x10
+	insert	logger -t pccard:$device -s LinkMates LM 336 inserted
+	insert	/etc/pccard_ether $device
+	remove	logger -t pccard:$device -s LinkMates LM 336 removed
+	remove	/sbin/ifconfig $device delete
+
 # IBM PCMCIA Ethernet I/II
 card "IBM Corp." "Ethernet"
 	config	0x1 "ed0" ?
@@ -376,6 +384,12 @@ card "MEGAHERTZ" "XJ2288"
 	insert	logger -t pccard:$device -s Megahertz XJ2288 inserted
 	remove	logger -t pccard:$device -s Megahertz XJ2288 removed
 
+# Megahertz XJ-CC4288
+card "Megahertz" "XJ-CC4288"
+	config	0x23 "sio2" ?
+	insert	logger -t pccard:$device -s Megahertz XJ-CC4288 inserted
+	remove	logger -t pccard:$device -s Megahertz XJ-CC4288 removed
+
 # Megahertz XJ4336
 card "Megahertz" "XJ4336-CC4336"
 	config	0x22 "sio2" ?
@@ -625,45 +639,63 @@ card "PCMCIA  " "56K V.90 Fax Modem (LK)  "
 #	insert	logger -t pccard:$device -s Panasonic FM radio card inserted
 #	remove	logger -t pccard:$device -s Panasonic FM radio card removed
 
+# IO Data CBIDE (bundled with CDP-FX24, etc.)
+card "WIT" "IDE16"
+	config	auto "ata0" ?
+	insert	logger -t pccard:$device -s IO Data CBIDE inserted
+	remove	logger -t pccard:$device -s IO Data CBIDE removed
+
+# IBM Flash ATA (Ricoh Flash ATA 10MB)
+card "IBM" "IBM17JSSFP10"
+	config	auto "ata0" ? iosize 16
+	insert	logger -t pccard:$device -s IBM Flash ATA inserted
+	remove	logger -t pccard:$device -s IBM flash ATA removed
+
+# Non-brand Compact Flash Card(32MB)
+card "       " "KCF 32M"
+	config	0x1 "ata2" ? iosize 16
+	insert	logger -t pccard:$device -s Compact Flash Card 32MB inserted
+	remove	logger -t pccard:$device -s Compact Flash Card 32MB removed
+
 # SunDisk Flash ATA
 # (OEM: Epson Flash Packer)
 card "SunDisk" "SDP5"
-	config	0x3 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s Sundisk Flash ATA inserted
 	remove	logger -t pccard:$device -s Sundisk Flash ATA removed
 
 card "SunDisk" "SDP"
-	config	0x3 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s SunDisk Flash ATA Inserted
 	remove	logger -t pccard:$device -s SunDisk Flash ATA removed
 
 # Midori Elec Fast Flash
 card "Midori Elec." "FAST FLASH"
-	config	0x3  "ata1" ?
+	config	0x3  "ata2" ?
 	insert	logger -t pccard:$device -s Midori Elec Fast FLASH inserted
 	remove	logger -t pccard:$device -s Midori Elec Fast FLASH removed
 
 # Simple Technology ata flash
 card "Simple Technology        " "STI-ATA"
-	config	0x2 "ata0" ?
+	config	0x2 "ata2" ?
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
 	
 # Viking ATA Flash card
 card "VIKING ATA/CF FLASH CARD " "TOR/AM "
-	config	0x2 "ata0" ?
+	config	0x2 "ata2" ?
 	insert	logger -t pccard:$device -s Simple Technology ata FLASH inserted
 	remove	logger -t pccard:$device -s Simple Technology ata FLASH removed
 	
 # Maxtor 131MB Type III HDD
 card "Maxtor" "MXL131"
-	config	0x03 "ata1" ?
+	config	0x03 "ata2" ?
 	insert	logger -t pccard:$device -s Maxtor 131MB HDD inserted
 	remove	logger -t pccard:$device -s Maxtor 131MB HDD removed
 
 # SiliconTech, Inc flash card
 card "SiliconTech,Inc" "16MB Compact PC Card"
-	config	0x1 "ata1" ?
+	config	0x1 "ata2" ?
 	insert	logger -t pccard:$device -s SiliconTech Flash ATA inserted
 	remove	logger -t pccard:$device -s SiliconTech Flash ATA removed