aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-12-30 10:52:28 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-12-30 10:52:28 +0000
commit4b4c80cc58c280b81a1555c6a51e44f40d79f1bb (patch)
tree2af0f92328dd0980e3f305856f3be10eb42677b5 /package/kernel
parentb6d65b89a4ffaf0c25f89f1787811b4b46c95821 (diff)
downloadupstream-4b4c80cc58c280b81a1555c6a51e44f40d79f1bb.tar.gz
upstream-4b4c80cc58c280b81a1555c6a51e44f40d79f1bb.tar.bz2
upstream-4b4c80cc58c280b81a1555c6a51e44f40d79f1bb.zip
[package] fix bluetooth and ide breakage after r18955 (#6422)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18972 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/modules/block.mk10
-rw-r--r--package/kernel/modules/other.mk4
2 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 3ece2342d3..f3c345e25b 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -194,8 +194,8 @@ define KernelPackage/ide-core
CONFIG_BLK_DEV_IDEPCI=y
FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk)
+ $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-gd_mod)
endef
define KernelPackage/ide-core/2.4
@@ -226,7 +226,7 @@ define KernelPackage/ide-aec62xx
TITLE:=Acard AEC62xx IDE driver
DEPENDS:=@PCI_SUPPORT +kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_AEC62XX
- FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+ FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,aec62xx)
endef
@@ -258,7 +258,7 @@ define KernelPackage/ide-pdc202xx
TITLE:=Promise PDC202xx IDE driver
DEPENDS:=+kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
- FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+ FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
endef
@@ -279,7 +279,7 @@ define KernelPackage/ide-it821x
TITLE:=ITE IT821x IDE driver
DEPENDS:=+kmod-ide-core
KCONFIG:=CONFIG_BLK_DEV_IT821X
- FILES=$(LINUX_DIR)/drivers/ide/pci/it821x.$(LINUX_KMOD_SUFFIX)
+ FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,it821x)
endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index c5d065cc6d..a23c3a3ceb 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -313,8 +313,8 @@ define KernelPackage/bluetooth/2.6
$(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb)
+ $(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb)
endef
define KernelPackage/bluetooth/description