remove ueagle-atm and use the in-kernel driver, split up usb-atm

SVN-Revision: 7438

3 files changed, 20 insertions, 75 deletions

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index daa7c91240..66425c0457 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -264,20 +264,35 @@ define KernelPackage/usb-storage
 endef
 $(eval $(call KernelPackage,usb-storage))
 
-
+define KernelPackage/usb-atm
+  $(call usbdep,@LINUX_2_6 kmod-atm)
+  TITLE:=Support for ATM on USB bus
+  DESCRIPTION:=Kernel support for USB DSL modems
+  KCONFIG:=$(CONFIG_USB_ATM)
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,usbatm)
+endef
+$(eval $(call KernelPackage,usb-atm))
 
 define KernelPackage/usb-speedtouch
   $(call usbdep,@LINUX_2_6 kmod-atm)
   TITLE:=Support for SpeedTouch ADSL modems
   DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems
   KCONFIG:=$(CONFIG_USB_SPEEDTOUCH)
-  FILES:= \
-	$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch)
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,70,speedtch)
 endef
 $(eval $(call KernelPackage,usb-speedtouch))
 
+define KernelPackage/ueagle-atm
+  $(call usbdep,@LINUX_2_6 kmod-atm)
+  TITLE:=Driver for Eagle 8051 based USB ADSL modems
+  DESCRIPTION:=Kernel support for Eagle 8051 based USB ADSL modems
+  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_USB_UEAGLEATM)
+  AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
+endef
+$(eval $(call KernelPackage,ueagle-atm))
 
 define KernelPackage/usb-pwc
   $(call usbdep,+kmod-videodev)
diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
deleted file mode 100644
index a014d82c06..0000000000
--- a/package/ueagle-atm/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ueagle-atm
-PKG_VERSION:=1.0d1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/
-PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/ueagle-atm
-  SUBMENU:=Network Devices
-  DEPENDS:=@ATM_SUPPORT kmod-usb-core 
-  TITLE:=Driver for Eagle 8051 based USB ADSL modems
-  URL:=http://www.eagle-usb.org/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-  FILES:= \
-	$(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \
-	$(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,usbatm ueagle-atm)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		TARGET="$(HAL_TARGET)" \
-		KERNELDIR="$(LINUX_DIR)" \
-		all
-endef
-
-$(eval $(call KernelPackage,ueagle-atm))
diff --git a/package/ueagle-atm/patches/100-compile_fix.patch b/package/ueagle-atm/patches/100-compile_fix.patch
deleted file mode 100644
index 796c159939..0000000000
--- a/package/ueagle-atm/patches/100-compile_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur ueagle-atm-1.0d1/driver/ueagle.c ueagle-atm-1.0d1.patched/driver/ueagle.c
---- ueagle-atm-1.0d1/driver/ueagle.c	2005-11-19 18:36:04.000000000 +0100
-+++ ueagle-atm-1.0d1.patched/driver/ueagle.c	2006-03-29 02:03:43.000000000 +0200
-@@ -1652,7 +1652,6 @@
-  * USB driver descriptor
-  */
- static struct usb_driver uea_driver = {
--	.owner = THIS_MODULE,
- 	.name = "ueagle-atm",
- 	.id_table = uea_ids,
- 	.probe = uea_probe,
-diff -ur ueagle.old/usbatm_iso/usbatm.h ueagle.dev/usbatm_iso/usbatm.h
---- ueagle.old/usbatm_iso/usbatm.h	2005-11-19 18:43:26.000000000 +0100
-+++ ueagle.dev/usbatm_iso/usbatm.h	2007-01-22 01:57:14.742998144 +0100
-@@ -24,11 +24,11 @@
- #ifndef	_USBATM_H_
- #define	_USBATM_H_
- 
-+#include <linux/autoconf.h>
- #include <asm/semaphore.h>
- #include <linux/atm.h>
- #include <linux/atmdev.h>
- #include <linux/completion.h>
--#include <linux/config.h>
- #include <linux/device.h>
- #include <linux/kernel.h>
- #include <linux/kref.h>