add brcm47xx-2.6 fixes from #1496

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

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index d2186a4..d391f8b 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -123,16 +123,17 @@ define KernelPackage/usb-audio
   $(call usbdep,+kmod-soundcore)
   TITLE:=Support for audio devices
   DESCRIPTION:=Kernel support for USB audio devices
   $(call usbdep,+kmod-soundcore)
   TITLE:=Support for audio devices
   DESCRIPTION:=Kernel support for USB audio devices

-  KCONFIG:=$(CONFIG_USB_AUDIO)

   AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.4
   AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.4

+  KCONFIG:=$(CONFIG_USB_AUDIO)

   FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
 endef
 
 define KernelPackage/usb-audio/2.6
   FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
 endef
 
 define KernelPackage/usb-audio/2.6

-  FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/audio.ko
+  KCONFIG:=$(CONFIG_SND_USB_AUDIO)
+  FILES:=$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko

 endef
 $(eval $(call KernelPackage,usb-audio))
 
 endef
 $(eval $(call KernelPackage,usb-audio))
 


@@ -232,10 +233,9 @@ define KernelPackage/usb-storage
   DESCRIPTION:=Kernel support for USB Mass Storage devices
   KCONFIG:=$(CONFIG_USB_STORAGE)
   FILES:= \
   DESCRIPTION:=Kernel support for USB Mass Storage devices
   KCONFIG:=$(CONFIG_USB_STORAGE)
   FILES:= \

-       $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-       $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \

        $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
        $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)

+  DEPENDS:=+kmod-scsi-core

 endef
 $(eval $(call KernelPackage,usb-storage))
 
 endef
 $(eval $(call KernelPackage,usb-storage))