From e12cd3d5ae4c09dbf49d20c29cff8f2183946c73 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 3 Nov 2011 15:16:39 +0000
Subject: ltq-dsl: fixes driver for targets other than danube

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28723 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ltq-dsl/Makefile               | 10 +++++-----
 package/ltq-dsl/src/Makefile           |  4 ++++
 package/ltq-dsl/src/ifxmips_atm_core.c |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'package')

diff --git a/package/ltq-dsl/Makefile b/package/ltq-dsl/Makefile
index 4a602e89d..973967eb6 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 a92317098..44d2efbc0 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 70ea2729a..92853bb88 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
-- 
cgit v1.2.3