X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3eb179df2d46da8fb0e74755c487cbc636e3e88d..c3a3e000b02e0efd5315b7421ad53f24fcd0eea2:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 5d156cc58..ac2824ed8 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -103,7 +103,25 @@ endef
 
 $(eval $(call KernelPackage,lp))
 
+define KernelPackage/pcspkr
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PC speaker support
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_INPUT_PCSPKR
+  FILES:= \
+	$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50, \
+  	pcspkr \
+  )
+endef
+
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
+endef
+
+$(eval $(call KernelPackage,pcspkr))
 
+# This activates PCMCIA support in ssb. This will be included in kmod-ssb.
 define KernelPackage/pcmcia-core
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PCMCIA/CardBus support
@@ -114,6 +132,9 @@ define KernelPackage/pcmcia-core
 	CONFIG_PCCARD \
 	CONFIG_YENTA \
 	CONFIG_PCCARD_NONSTATIC \
+	CONFIG_SSB_PCMCIAHOST=y \
+	CONFIG_SSB_PCMCIAHOST_POSSIBLE=y \
+	CONFIG_SSB_BLOCKIO=y \
 	PCMCIA_DEBUG=n
 endef
 
@@ -124,7 +145,7 @@ define KernelPackage/pcmcia-core/2.4
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds)
+  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds)
 endef
 
 define KernelPackage/pcmcia-core/2.6
@@ -138,7 +159,7 @@ define KernelPackage/pcmcia-core/2.6
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic)
+  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia rsrc_nonstatic)
 endef
 
 define KernelPackage/pcmcia-core/description
@@ -240,7 +261,6 @@ define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -256,27 +276,9 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
 	CONFIG_BT_RFCOMM \
 	CONFIG_BT_BNEP \
 	CONFIG_BT_HCIBTUSB \
-	CONFIG_BT_HCIUART \
-	CONFIG_BT_HIDP
-else
-  KCONFIG:= \
-	CONFIG_BLUEZ \
-	CONFIG_BLUEZ_L2CAP \
-	CONFIG_BLUEZ_SCO \
-	CONFIG_BLUEZ_RFCOMM \
-	CONFIG_BLUEZ_BNEP \
-	CONFIG_BLUEZ_HCIUART \
-	CONFIG_BLUEZ_HCIUSB \
-	CONFIG_BLUEZ_HIDP \
-	CONFIG_BT \
-	CONFIG_BT_L2CAP \
-	CONFIG_BT_SCO \
-	CONFIG_BT_RFCOMM \
-	CONFIG_BT_BNEP \
 	CONFIG_BT_HCIUSB \
 	CONFIG_BT_HCIUART \
 	CONFIG_BT_HIDP
-endif
 endef
 
 define KernelPackage/bluetooth/2.4
@@ -308,7 +310,7 @@ define KernelPackage/bluetooth/2.6
 #	CONFIG_BT_BNEP \
 #	CONFIG_BT_HCIUSB \
 #	CONFIG_BT_HCIUART
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),1)
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -620,7 +622,7 @@ define KernelPackage/input-core
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
   FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,input-core)
+  AUTOLOAD:=$(call AutoLoad,19,input-core)
 endef
 
 define KernelPackage/input-core/description
@@ -668,7 +670,7 @@ define KernelPackage/input-polldev
   DEPENDS:=+kmod-input-core @LINUX_2_6
   KCONFIG:=CONFIG_INPUT_POLLDEV
   FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,61,input-polldev)
+  AUTOLOAD:=$(call AutoLoad,20,input-polldev)
 endef
 
 define KernelPackage/input-polldev/description
@@ -885,11 +887,13 @@ define KernelPackage/rtc-core
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_RTC_CLASS \
+	CONFIG_RTC_LIB \
 	CONFIG_RTC_HCTOSYS=y \
 	CONFIG_RTC_HCTOSYS_DEVICE=rtc0
   FILES:= \
-	$(LINUX_DIR)/drivers/rtc/rtc-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,rtc-core)
+	$(LINUX_DIR)/drivers/rtc/rtc-core.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/rtc/rtc-lib.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,rtc-lib rtc-core)
 endef
 
 define KernelPackage/rtc-core/description