RTCs shouldn't be modules, ever..

[openwrt.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 8118361..392a88e 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -121,6 +121,7 @@ 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
@@ -131,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
 
@@ -141,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
@@ -155,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
@@ -306,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) \
@@ -618,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
@@ -666,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
@@ -875,40 +879,3 @@ define KernelPackage/rfkill/description
 endef
 
 $(eval $(call KernelPackage,rfkill))
-
-
-define KernelPackage/rtc-core
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Kernel support for RTC devices
-  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) \
-       $(LINUX_DIR)/drivers/rtc/rtc-lib.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,rtc-lib rtc-core)
-endef
-
-define KernelPackage/rtc-core/description
- Kernel module for the RTC devices.
-endef
-
-$(eval $(call KernelPackage,rtc-core))
-
-define KernelPackage/rtc-m48t86
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=RTC M48T86 / Dallas DS12887
-  DEPENDS:=+kmod-rtc-core
-  KCONFIG:=CONFIG_RTC_DRV_M48T86
-  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-m48t86.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,31,rtc-m48t86)
-endef
-
-define KernelPackage/rtc-m48t86/description
-  Kernel support for the RTC device M48T86 / Dallas DS12887
-endef
-
-$(eval $(call KernelPackage,rtc-m48t86))