--- zzzz-none-000/linux-2.6.28.10/arch/arm/include/asm/setup.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/arm/include/asm/setup.h	2009-11-26 14:39:50.000000000 +0000
@@ -15,6 +15,7 @@
 #define __ASMARM_SETUP_H
 
 #include <asm/types.h>
+#include <linux/env.h>
 
 #define COMMAND_LINE_SIZE 1024
 
@@ -143,6 +144,21 @@
 	__u32 fmemclk;
 };
 
+/*--- AVM environment ---*/
+#define ATAG_ENVP   0x41000403
+
+struct tag_envp {
+    u32 envp;
+};
+
+/*--- AVM environment ---*/
+#define ATAG_WLAN_DECT_CONF   0x41000404
+
+struct tag_wlan_dect_conf {
+    u32 address;
+};
+
+
 struct tag {
 	struct tag_header hdr;
 	union {
@@ -155,6 +171,8 @@
 		struct tag_revision	revision;
 		struct tag_videolfb	videolfb;
 		struct tag_cmdline	cmdline;
+        struct tag_envp     envp;
+        struct tag_wlan_dect_conf wlan_dect;
 
 		/*
 		 * Acorn specific
@@ -228,6 +246,7 @@
 	void (*fn)(char **p);
 };
 
+
 #define __early_param(name,fn)					\
 static struct early_params __early_##fn __used			\
 __attribute__((__section__(".early_param.init"))) = { name, fn }