merge r21247

SVN-Revision: 21339

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 68d9c88e1ac26c3cf0ff127e905b8f57e4e9be67..52fbc525ed8ddb0c6b14746db27ce99ac826788d 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -105,8 +105,22 @@ define KernelPackage/lp
   AUTOLOAD:=$(call AutoLoad,50,parport lp)
 endef
 
+define KernelPackage/lp/2.4
+  FILES:= \
+       $(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50, \
+       parport \
+       parport_splink \
+       lp \
+  )
+endef
+
 $(eval $(call KernelPackage,lp))
 
+
 define KernelPackage/pcspkr
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PC speaker support

diff --git a/target/linux/brcm-2.4/modules.mk b/target/linux/brcm-2.4/modules.mk
deleted file mode 100644 (file)
index 44f5440..0000000
--- a/target/linux/brcm-2.4/modules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-define KernelPackage/lp/brcm-2.4
-  FILES:= \
-       $(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50, \
-       parport \
-       parport_splink \
-       lp \
-  )
-endef
-