hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel/modules: remove merge conflicts leftovers 

Signed-off-by: Nicolas Thill <nico@openwrt.org>

SVN-Revision: 45243
lede-17.01
Nicolas Thill 2015-04-02 14:53:19 +00:00
parent 1fe3836fbc
commit 3bd422f610
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/kernel/linux/modules/usb.mk
View File

@ -633,7 +633,6 @@ endef
$(eval $(call KernelPackage,usb-serial-ftdi)) $(eval $(call KernelPackage,usb-serial-ftdi))
<<<<<<< HEAD
define KernelPackage/usb-serial-garmin define KernelPackage/usb-serial-garmin
TITLE:=Support for Garmin GPS devices TITLE:=Support for Garmin GPS devices
KCONFIG:=CONFIG_USB_SERIAL_GARMIN KCONFIG:=CONFIG_USB_SERIAL_GARMIN
@ -647,34 +646,6 @@ define KernelPackage/usb-serial-garmin/description
endef endef
$(eval $(call KernelPackage,usb-serial-garmin)) $(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 define KernelPackage/usb-serial-simple