[oe-commits] org.oe.dev linux-handhelds-2.6: Enable PCMCIA for ACX_CS.

[pfalcon commit]

linux-handhelds-2.6: Enable PCMCIA for ACX_CS.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8e097cf6a372f389a56b185ce5552dea6d67293f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8e097cf6a372f389a56b185ce5552dea6d67293f
Files:
1
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
Diffs:

#
# mt diff -rd0b13860215bc7a1ddc7b749e2f4df05e0be49da -r8e097cf6a372f389a56b185ce5552dea6d67293f
#
# 
# 
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
#  from [ba1fb3add92bcb86f4c6b18b6fc7b6633de84aa8]
#    to [af0d759545fd4769dbb73dbfc63b63b5127fb5e3]
# 
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
#  from [394a2ef93b1da19040ae14ce69fa97b8bd62e7eb]
#    to [e988adccc6557607a32ed6ac0c24eb135e0e72d2]
# 
============================================================
--- packages/linux/linux-handhelds-2.6/h4000/defconfig	ba1fb3add92bcb86f4c6b18b6fc7b6633de84aa8
+++ packages/linux/linux-handhelds-2.6/h4000/defconfig	af0d759545fd4769dbb73dbfc63b63b5127fb5e3
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh11
-# Wed Jul 11 07:04:14 2007
+# Wed Jul 11 07:31:39 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -161,6 +161,7 @@ CONFIG_IPAQ_H4000_BACKLIGHT=y
 CONFIG_IPAQ_H4000_IRDA=y
 CONFIG_IPAQ_H4000_LCD=y
 CONFIG_IPAQ_H4000_BACKLIGHT=y
+CONFIG_IPAQ_H4000_PCMCIA=y
 CONFIG_IPAQ_H4000_BUTTONS=y
 CONFIG_IPAQ_H4000_LEDS=y
 CONFIG_IPAQ_H4000_BT=m
@@ -227,9 +228,18 @@ CONFIG_XSCALE_PMU=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
 
 #
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
 # Kernel Features
 #
 CONFIG_PREEMPT=y
@@ -467,6 +477,10 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_WIRELESS_EXT=y
@@ -673,12 +687,37 @@ CONFIG_NET_RADIO=y
 # Obsolete Wireless cards support (pre-802.11)
 #
 # CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_HOSTAP is not set
 CONFIG_ACX=m
 # CONFIG_ACX_MEM is not set
 CONFIG_ACX_CS=y
+CONFIG_NET_WIRELESS=y
 
 #
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
 # Wan interfaces
 #
 # CONFIG_WAN is not set
@@ -802,6 +841,13 @@ CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_TIHTC is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
@@ -1029,6 +1075,12 @@ CONFIG_SND_PXA2xx_I2SOUND=m
 # CONFIG_SND_RECON is not set
 
 #
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
 # SoC audio support
 #
 # CONFIG_SND_SOC is not set
============================================================
--- packages/linux/linux-handhelds-2.6/htcblueangel/defconfig	394a2ef93b1da19040ae14ce69fa97b8bd62e7eb
+++ packages/linux/linux-handhelds-2.6/htcblueangel/defconfig	e988adccc6557607a32ed6ac0c24eb135e0e72d2
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh11
-# Wed Jul 11 07:04:17 2007
+# Wed Jul 11 07:31:42 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -232,9 +232,18 @@ CONFIG_XSCALE_PMU=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
 
 #
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
 # Kernel Features
 #
 CONFIG_PREEMPT=y
@@ -472,6 +481,10 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIDTL1 is not set
+# CONFIG_BT_HCIBT3C is not set
+# CONFIG_BT_HCIBLUECARD is not set
+# CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_WIRELESS_EXT=y
@@ -678,12 +691,37 @@ CONFIG_NET_RADIO=y
 # Obsolete Wireless cards support (pre-802.11)
 #
 # CONFIG_STRIP is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+# CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_HOSTAP is not set
 CONFIG_ACX=m
 # CONFIG_ACX_MEM is not set
 CONFIG_ACX_CS=y
+CONFIG_NET_WIRELESS=y
 
 #
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
 # Wan interfaces
 #
 # CONFIG_WAN is not set
@@ -809,6 +847,13 @@ CONFIG_TIHTC=m
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 CONFIG_TIHTC=m
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
@@ -1048,6 +1093,12 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_RECON is not set
 
 #
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
 # SoC audio support
 #
 CONFIG_SND_SOC=m