X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/129452e7a9452a81f99e566a88b67a32880b0550..9c9f7681607c5015459ede0bf97597c5fd9008de:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a5cc4de8f..89b5b93ea 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -51,7 +51,7 @@ define KernelPackage/ide-core
   KCONFIG:=$(CONFIG_IDE)
   FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
 endef
 $(eval $(call KernelPackage,ide-core))
 
@@ -64,6 +64,24 @@ define KernelPackage/ide-pdc202xx
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+define KernelPackage/ide-aec62xx
+  TITLE:=AEC62xx IDE driver
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX)
+  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,aec62xx)
+endef
+$(eval $(call KernelPackage,ide-aec62xx))
+
+define KernelPackage/scsi-core
+  TITLE:=Kernel support for SCSI
+  SUBMENU:=$(EMENU)
+  KCONFIG:=$(CONFIG_BLK_DEV_SD)
+  FILES:= \
+    $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+    $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,scsi-core))
 
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
@@ -86,19 +104,22 @@ define KernelPackage/soundcore
   DESCRIPTION:=Kernel modules for sound support
   KCONFIG:=$(CONFIG_SOUND)
   SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
 define KernelPackage/soundcore/2.4
   FILES:=$(MODULES_DIR)/kernel/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
 define KernelPackage/soundcore/2.6
-  FILES:=$(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  FILES:= \
+	$(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/sound/core/*.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/sound/core/oss/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
 endef
 $(eval $(call KernelPackage,soundcore))
 
-
 define KernelPackage/loop
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support
@@ -119,6 +140,15 @@ define KernelPackage/nbd
 endef
 $(eval $(call KernelPackage,nbd))
 
+define KernelPackage/capi
+  TITLE:=CAPI Support
+  DESCRIPTION:=Kernel module for basic CAPI support
+  KCONFIG:=$(CONFIG_ISDN) $(CONFIG_ISDN_CAPI) $(CONFIG_ISDN_CAPI_CAPI20)
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  FILES:=$(MODULES_DIR)/kernel/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,capi))
 
 define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
@@ -141,7 +171,7 @@ define KernelPackage/pcmcia-core/2.6
 	$(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
 endef
 $(eval $(call KernelPackage,pcmcia-core))
 
@@ -168,6 +198,7 @@ $(eval $(call KernelPackage,pcmcia-serial))
 
 define KernelPackage/bluetooth
   TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
   SUBMENU:=$(EMENU)
  endef
@@ -179,9 +210,10 @@ define KernelPackage/bluetooth
 	$(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm hci_uart hci_usb)
+  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm bnep hci_uart hci_usb)
 endef
 
 define KernelPackage/bluetooth/2.6
@@ -191,12 +223,29 @@ define KernelPackage/bluetooth/2.6
 	$(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm hci_uart hci_usb)
+  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb)
 endef
 $(eval $(call KernelPackage,bluetooth))
 
+define KernelPackage/mmc
+  TITLE:=MMC/SD Card Support
+  DEPENDS:=@LINUX_2_6_AT91
+  DESCRIPTION:=Kernel support for MMC/SD cards
+  SUBMENU:=$(EMENU)
+ endef
+
+define KernelPackage/mmc/2.6
+	KCONFIG:=$(CONFIG_MMC)
+	FILES:= \
+	$(MODULES_DIR)/kernel/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
+	AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
+endef
+$(eval $(call KernelPackage,mmc))
 
 define KernelPackage/softdog
   TITLE:=Software watchdog driver
@@ -221,6 +270,7 @@ $(eval $(call KernelPackage,softdog))
 define KernelPackage/videodev
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
+  DEPENDS:=@VIDEO_SUPPORT
   SUBMENU:=$(EMENU)
   KCONFIG:=$(CONFIG_VIDEO_DEV)
   FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
@@ -231,7 +281,7 @@ define KernelPackage/videodev/2.4
 endef
 
 define KernelPackage/videodev/2.6
-  AUTOLOAD:=$(call AutoLoad,60,v4l2-common videodev)
+  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat videodev)
 endef
 $(eval $(call KernelPackage,videodev))