diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-12-30 10:52:28 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-12-30 10:52:28 +0000 |
| commit | 1c5bc31e1714a6e5017ca380e073ae3ce663bb57 (patch) | |
| tree | ebf004e6e2a78f96bbca261d15304303bd7a9b2c | |
| parent | b6f5eeb1eed804c4b9a0876b024293dd68317f42 (diff) | |
| download | upstream-1c5bc31e1714a6e5017ca380e073ae3ce663bb57.tar.gz upstream-1c5bc31e1714a6e5017ca380e073ae3ce663bb57.tar.bz2 upstream-1c5bc31e1714a6e5017ca380e073ae3ce663bb57.zip | |
fix bluetooth and ide breakage after r18955 (#6422)
SVN-Revision: 18972
| -rw-r--r-- | package/kernel/modules/block.mk | 10 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 4 |
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 |