aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2015-04-02 14:53:19 +0000
committerNicolas Thill <nico@openwrt.org>2015-04-02 14:53:19 +0000
commit3bd422f61026ff49281380a8865889c2ad7b2e7b (patch)
tree1962c04330e7ca5aa836848359aaee5d4e52c507 /package/kernel/linux
parent1fe3836fbc598ca03fa199439c3e66d6b45f6b64 (diff)
downloadupstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.gz
upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.tar.bz2
upstream-3bd422f61026ff49281380a8865889c2ad7b2e7b.zip
kernel/modules: remove merge conflicts leftovers
Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 45243
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/usb.mk29
1 files changed, 0 insertions, 29 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 38b75a32a9..4950ab8f74 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -633,7 +633,6 @@ endef
$(eval $(call KernelPackage,usb-serial-ftdi))
-<<<<<<< HEAD
define KernelPackage/usb-serial-garmin
TITLE:=Support for Garmin GPS devices
KCONFIG:=CONFIG_USB_SERIAL_GARMIN
@@ -647,34 +646,6 @@ define KernelPackage/usb-serial-garmin/description
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