X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fother.mk;h=973e4f3e26a57c5d979afe0e9c43796e3ce46188;hb=eaf79d06b761726ba05edfeb89643e80ae67b24b;hp=94f98fffc9539b91fedb728db0234f30fe4e45ca;hpb=24b0424ecb1c98a83f00b5ceb629d22c2765e4f0;p=openwrt%2F.git

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 94f98fffc9..973e4f3e26 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -285,51 +285,18 @@ endef
 $(eval $(call KernelPackage,gpio-pcf857x))
 
 
-define KernelPackage/ppdev
+define KernelPackage/lp
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Parallel port support
+  TITLE:=Parallel port and line printer support
   KCONFIG:= \
 	CONFIG_PARPORT \
+	CONFIG_PRINTER \
 	CONFIG_PPDEV
   FILES:= \
 	$(LINUX_DIR)/drivers/parport/parport.ko \
+	$(LINUX_DIR)/drivers/char/lp.ko \
 	$(LINUX_DIR)/drivers/char/ppdev.ko
-  AUTOLOAD:=$(call AutoLoad,50,parport ppdev)
-endef
-
-$(eval $(call KernelPackage,ppdev))
-
-
-define KernelPackage/parport-pc
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Parallel port interface (PC-style) support
-  DEPENDS:=+kmod-ppdev
-  KCONFIG:= \
-	CONFIG_PARPORT_PC \
-	CONFIG_PARPORT_1284=y \
-	CONFIG_PARPORT_PC_FIFO=y \
-	CONFIG_PARPORT_PC_SUPERIO=y \
-	CONFIG_PARPORT_SERIAL=n \
-	CONFIG_PARIDE=n \
-	CONFIG_SCSI_IMM=n \
-	CONFIG_SCSI_PPA=n
-  FILES:= \
-	$(LINUX_DIR)/drivers/parport/parport_pc.ko
-  AUTOLOAD:=$(call AutoLoad,51,parport_pc)
-endef
-
-$(eval $(call KernelPackage,parport-pc))
-
-
-define KernelPackage/lp
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Parallel port line printer device support
-  DEPENDS:=+kmod-ppdev
-  KCONFIG:= \
-	CONFIG_PRINTER
-  FILES:= \
-	$(LINUX_DIR)/drivers/char/lp.ko
-  AUTOLOAD:=$(call AutoLoad,52,lp)
+  AUTOLOAD:=$(call AutoLoad,50,parport lp ppdev)
 endef
 
 $(eval $(call KernelPackage,lp))