Author: nico Date: 2015-04-02 16:53:19 +0200 (Thu, 02 Apr 2015) New Revision: 45243
Modified: trunk/package/kernel/linux/modules/usb.mk Log: kernel/modules: remove merge conflicts leftovers Signed-off-by: Nicolas Thill <[email protected]> Modified: trunk/package/kernel/linux/modules/usb.mk =================================================================== --- trunk/package/kernel/linux/modules/usb.mk 2015-04-02 14:53:12 UTC (rev 45242) +++ trunk/package/kernel/linux/modules/usb.mk 2015-04-02 14:53:19 UTC (rev 45243) @@ -633,7 +633,6 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) -<<<<<<< HEAD define KernelPackage/usb-serial-garmin TITLE:=Support for Garmin GPS devices KCONFIG:=CONFIG_USB_SERIAL_GARMIN @@ -647,36 +646,8 @@ endef $(eval $(call KernelPackage,usb-serial-garmin)) -======= -define KernelPackage/usb-serial-simple - TITLE:=USB Serial Simple (Motorola phone) - KCONFIG:=CONFIG_USB_SERIAL_SIMPLE - FILES:=$(LINUX_DIR)/drivers/usb/serial/usb-serial-simple.ko - AUTOLOAD:=$(call AutoProbe,usb-serial-simple) - $(call AddDepends/usb-serial) -endef -define KernelPackage/usb-serial-simple/description - Kernel support for "very simple devices". -Specifically, it supports: - - Suunto ANT+ USB device. - - Medtronic CareLink USB device (3.18) - - Fundamental Software dongle. - - Google USB serial devices (3.19) - - HP4x calculators - - a number of Motorola phones - - Novatel Wireless GPS receivers (3.18) - - Siemens USB/MPI adapter. - - ViVOtech ViVOpay USB device. - - Infineon Modem Flashloader USB interface - - ZIO Motherboard USB serial interface -endef - -$(eval $(call KernelPackage,usb-serial-simple)) ->>>>>>> kernel: add usb-serial-simple module - - define KernelPackage/usb-serial-simple TITLE:=USB Serial Simple (Motorola phone) KCONFIG:=CONFIG_USB_SERIAL_SIMPLE _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
