From: John Crispin <john@openwrt.org>
Date: Thu, 3 Nov 2011 15:16:39 +0000 (+0000)
Subject: ltq-dsl: fixes driver for targets other than danube
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4263d93da056f19444fdd07acdea3a0c4b1e2c1c;p=openwrt%2Fstaging%2Fblocktrron.git

ltq-dsl: fixes driver for targets other than danube

SVN-Revision: 28723
---

diff --git a/package/ltq-dsl/Makefile b/package/ltq-dsl/Makefile
index 4a602e89d2..973967eb63 100644
--- a/package/ltq-dsl/Makefile
+++ b/package/ltq-dsl/Makefile
@@ -140,7 +140,7 @@ endef
 define Build/Compile
 	cd $(LINUX_DIR); \
 		ARCH=mips CROSS_COMPILE="$(KERNEL_CROSS)" \
-		BUILD_VARIANT=$(BUILD_VARIANT) $(MAKE) M=$(PKG_BUILD_DIR)/src/mei/ V=1 modules
+		$(MAKE) BUILD_VARIANT=$(BUILD_VARIANT) M=$(PKG_BUILD_DIR)/src/mei/ V=1 modules
 	$(call Build/Compile/Default)
 endef
 
@@ -163,10 +163,6 @@ define Package/kmod-ltq-dsl-firmware-$(BUILD_VARIANT)/install
 	$(CP) $(PKG_BUILD_DIR)/$(FW_NAME)/ltq-dsl-fw-$(BUILD_VARIANT).bin $(1)/lib/firmware/ModemHWE.bin
 endef
 
-$(eval $(call KernelPackage,ltq-dsl-danube))
-$(eval $(call KernelPackage,ltq-dsl-ase))
-$(eval $(call KernelPackage,ltq-dsl-ar9))
-#$(eval $(call KernelPackage,ltq-dsl-vr9))
 $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-danube))
 $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-b-danube))
 $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-ase))
@@ -175,3 +171,7 @@ $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-ar9))
 $(eval $(call BuildPackage,kmod-ltq-dsl-firmware-b-ar9))
 #$(eval $(call BuildPackage,kmod-ltq-dsl-firmware-a-vr9))
 #$(eval $(call BuildPackage,kmod-ltq-dsl-firmware-b-vr9))
+$(eval $(call KernelPackage,ltq-dsl-danube))
+$(eval $(call KernelPackage,ltq-dsl-ase))
+$(eval $(call KernelPackage,ltq-dsl-ar9))
+#$(eval $(call KernelPackage,ltq-dsl-vr9))
diff --git a/package/ltq-dsl/src/Makefile b/package/ltq-dsl/src/Makefile
index a923170981..44d2efbc05 100644
--- a/package/ltq-dsl/src/Makefile
+++ b/package/ltq-dsl/src/Makefile
@@ -2,18 +2,22 @@ obj-m = lantiq_mei.o lantiq_atm.o
 lantiq_atm-objs := ifxmips_atm_core.o
 
 ifeq ($(BUILD_VARIANT),danube)
+  CFLAGS_MODULE+=-DCONFIG_DANUBE
   EXTRA_CFLAGS+=-DCONFIG_DANUBE
   lantiq_atm-objs += ifxmips_atm_danube.o
 endif
 ifeq ($(BUILD_VARIANT),ase)
+  CFLAGS_MODULE+=-DCONFIG_AMAZON_SE
   EXTRA_CFLAGS+=-DCONFIG_AMAZON_SE
   lantiq_atm-objs += ifxmips_atm_amazon_se.o
 endif
 ifeq ($(BUILD_VARIANT),ar9)
+  CFLAGS_MODULE+=-DCONFIG_AR9
   EXTRA_CFLAGS+=-DCONFIG_AR9
   lantiq_atm-objs += ifxmips_atm_ar9.o
 endif
 ifeq ($(BUILD_VARIANT),vr9)
+  CFLAGS_MODULE+=-DCONFIG_VR9
   EXTRA_CFLAGS+=-DCONFIG_VR9
   lantiq_atm-objs += ifxmips_atm_vr9.o
 endif
diff --git a/package/ltq-dsl/src/ifxmips_atm_core.c b/package/ltq-dsl/src/ifxmips_atm_core.c
index 70ea2729ab..92853bb886 100644
--- a/package/ltq-dsl/src/ifxmips_atm_core.c
+++ b/package/ltq-dsl/src/ifxmips_atm_core.c
@@ -56,6 +56,7 @@
 #include <linux/atmdev.h>
 #include <linux/atm.h>
 #include <linux/clk.h>
+#include <linux/interrupt.h>
 
 /*
  *  Chip Specific Head File