add bluetooth for one user's bluetooth kb+mouse, fix usb module stuff, add in support...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@138 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/x86_64/kernel-config-2.6 b/x86_64/kernel-config-2.6
index 027688dac354648d46c7f4e84939e9ac788f2315..4e2c6d7628022e8289f97dae88c5741efb6b2372 100644 (file)
--- a/x86_64/kernel-config-2.6
+++ b/x86_64/kernel-config-2.6
@@ -303,7 +303,7 @@ CONFIG_BLK_DEV_HPT34X=m
 # CONFIG_HPT34X_AUTODMA is not set
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_SC1200=m
-# CONFIG_BLK_DEV_PIIX is not set
+CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_NS87415=m
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
@@ -685,7 +685,30 @@ CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_BCSP_TXCRC=y
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# 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_NETDEVICES=y
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
@@ -1368,17 +1391,20 @@ CONFIG_USB_BANDWIDTH=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
 
 #
 # USB Device Class drivers
 #
 # CONFIG_USB_AUDIO is not set
-CONFIG_USB_BLUETOOTH_TTY=m
+
+#
+# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
+#
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set

diff --git a/x86_64/kernel-config-2.6-smp b/x86_64/kernel-config-2.6-smp
index 338463f46b9eeb36761132d84743f508a94c84a9..21543535bd00ac2fa9ead33a9297768ac2a40496 100644 (file)
--- a/x86_64/kernel-config-2.6-smp
+++ b/x86_64/kernel-config-2.6-smp
@@ -310,7 +310,7 @@ CONFIG_BLK_DEV_HPT34X=m
 # CONFIG_HPT34X_AUTODMA is not set
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_SC1200=m
-# CONFIG_BLK_DEV_PIIX is not set
+CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_NS87415=m
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
@@ -692,7 +692,30 @@ CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-# CONFIG_BT is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_BCSP_TXCRC=y
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# 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_NETDEVICES=y
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
@@ -1363,17 +1386,20 @@ CONFIG_USB_BANDWIDTH=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
 
 #
 # USB Device Class drivers
 #
 # CONFIG_USB_AUDIO is not set
-CONFIG_USB_BLUETOOTH_TTY=m
+
+#
+# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
+#
 # CONFIG_USB_MIDI is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set

diff --git a/x86_64/modules_load b/x86_64/modules_load
index 14cd2101aacc51c6143b500321f6225fc744a479..ad68391a49ae6438930b63533a3932159629f337 100644 (file)
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -18,4 +18,4 @@ MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
 MODULES_PCMCIA="ide-cs"
-MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"
+MODULES_USB="ehci-hcd uhci-hcd ohci-hcd hid usb-storage"