From 42f147a3f6893516a68ce9c1592f27ae85eec2a9 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 13 Jan 2006 17:33:38 +0000 Subject: [PATCH] fix module dependancies git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2955 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/linux/generic-2.6/modules.mk | 10 +++++----- openwrt/target/linux/package/alsa/Makefile | 2 +- openwrt/target/linux/package/madwifi/Makefile | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openwrt/target/linux/generic-2.6/modules.mk b/openwrt/target/linux/generic-2.6/modules.mk index 318190b48..71b3df577 100644 --- a/openwrt/target/linux/generic-2.6/modules.mk +++ b/openwrt/target/linux/generic-2.6/modules.mk @@ -271,8 +271,8 @@ $(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ ,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd)) $(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ - $(MODULES_DIR)/kernel/drivers/usb/host/uhci.ko \ -,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci)) + $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \ +,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd)) $(eval $(call KMOD_template,USB2,usb2,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \ @@ -282,9 +282,9 @@ $(eval $(call KMOD_template,USB_ACM,usb-acm,\ $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \ ,CONFIG_USB_ACM)) -#$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ -# $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \ -#,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) +$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ + $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \ +,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) $(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \ diff --git a/openwrt/target/linux/package/alsa/Makefile b/openwrt/target/linux/package/alsa/Makefile index 711ee1fc4..dd743874c 100644 --- a/openwrt/target/linux/package/alsa/Makefile +++ b/openwrt/target/linux/package/alsa/Makefile @@ -25,7 +25,7 @@ KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap endif -$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(LINUX_RELEASE)))) +$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile index 3f2b4c19b..c028cb26b 100644 --- a/openwrt/target/linux/package/madwifi/Makefile +++ b/openwrt/target/linux/package/madwifi/Makefile @@ -3,16 +3,16 @@ include $(TOPDIR)/rules.mk include ../../rules.mk -PKG_NAME:=madwifi +PKG_NAME:=madwifi-ng PKG_VERSION:=r1394-20060113 PKG_RELEASE:=1 PKG_MD5SUM:=03c870933ff4a89ed520fb732c4b553d -PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng -PKG_SOURCE:=$(PKG_NAME)-ng-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_NAME) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-ng-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) ifeq ($(ARCH),mips) HAL_TARGET:=mips-be-elf @@ -34,7 +34,7 @@ endif include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(LINUX_RELEASE)))) +$(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) $(PKG_BUILD_DIR)/.configured: touch $@ -- 2.20.1