add mtd cleanup, fix #17

[openwrt.git] / openwrt / target / linux / linux-2.6 / Makefile

diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile
index 9bd1e7c..f0ba690 100644 (file)
--- a/openwrt/target/linux/linux-2.6/Makefile
+++ b/openwrt/target/linux/linux-2.6/Makefile
@@ -31,7 +31,7 @@ IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CO
 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 PKG_RELEASE := 1
 
 PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
 PKG_RELEASE := 1
 

-KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel-$(LINUX_VERSION)-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk
+KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk

 KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \
 KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
 
 KPKG_MAKEOPTS:=        IPKG="$(IPKG_KERNEL)" \


@@ -47,6 +47,10 @@ include $(LINUX_KCONFIG)
 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS := 
 
 INSTALL_TARGETS := $(KERNEL_IPKG)
 TARGETS := 
 

+ifeq ($(BOARD),x86)
+include ./x86.mk
+endif
+

 
 # Networking
 
 
 # Networking
 


@@ -171,7 +175,7 @@ $(eval $(call KMOD_template,FS_XFS,fs-xfs,\
 # Multimedia
 
 $(eval $(call KMOD_template,PWC,pwc,\
 # Multimedia
 
 $(eval $(call KMOD_template,PWC,pwc,\

-       $(MODULES_DIR)/kernel/drivers/usb/pwc.ko \
+       $(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \

 ,CONFIG_USB_PWC,kmod-videodev,63,pwc))
 
 $(eval $(call KMOD_template,SOUNDCORE,soundcore,\
 ,CONFIG_USB_PWC,kmod-videodev,63,pwc))
 
 $(eval $(call KMOD_template,SOUNDCORE,soundcore,\