From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 5 Oct 2009 20:14:49 +0000 (+0000)
Subject: et131x: use the in-kernel staging driver on 2.6.31 instead of the external sources
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=0c5774a1fe80693694ae862297646e21f942cb0c;p=packages.git

et131x: use the in-kernel staging driver on 2.6.31 instead of the external sources

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17932 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/et131x/Makefile b/net/et131x/Makefile
index 1863acc1e..4c909ad95 100644
--- a/net/et131x/Makefile
+++ b/net/et131x/Makefile
@@ -11,11 +11,20 @@ PKG_MD5SUM:=9496422c7d218f27bae1be42a04d122e
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(CONFIG_LINUX_2_6_31),)
+  MODULE:=$(PKG_BUILD_DIR)/et131x.$(LINUX_KMOD_SUFFIX)
+else
+  MODULE:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
+endif
+
 define KernelPackage/et131x
   SUBMENU:=Network Devices
   TITLE:=Agere ET131x Gigabit Ethernet driver
   URL:=http://sourceforge.net/projects/et131x
-  FILES:=$(PKG_BUILD_DIR)/et131x.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(MODULE)
+  KCONFIG:= \
+  	CONFIG_ET131X=m \
+	CONFIG_ET131X_DEBUG=n
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT
   AUTOLOAD:=$(call AutoLoad,70,et131x)
 endef
@@ -24,14 +33,26 @@ define KernelPackage/et131x/description
   This package contains the et131x kernel module.
 endef
 
-define Build/Compile
+ifeq ($(CONFIG_LINUX_2_6_31),)
+  define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
 		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)"
-endef
+  endef
+else
+  define Build/Prepare
+    # nothing to do
+  endef
+  define Build/Configure
+    # nothing to do
+  endef
+  define Build/Compile
+    # nothing to do
+  endef
+endif
 
 $(eval $(call KernelPackage,et131x))