---
 arch/arm/Makefile                   |    3 	3 +	0 -	0 !
 arch/arm/mach-s3c2410/Kconfig       |    8 	8 +	0 -	0 !
 arch/arm/mach-s3c2410/Makefile.boot |    5 	4 +	1 -	0 !
 3 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/arm/mach-s3c2410/Makefile.boot
===================================================================
--- linux-2.6.orig/arch/arm/mach-s3c2410/Makefile.boot	2006-12-10 16:38:20.000000000 +0100
+++ linux-2.6/arch/arm/mach-s3c2410/Makefile.boot	2006-12-10 23:26:36.000000000 +0100
@@ -1,3 +1,6 @@
-   zreladdr-y	:= 0x30008000
+zreladdr-y	:= 0x30008000
+ifeq ($(CONFIG_S3C24XX_IPAQ_OFFSETS),y)
+zreladdr-y	:= 0x30208000
+endif
 params_phys-y	:= 0x30000100
 
Index: linux-2.6/arch/arm/Makefile
===================================================================
--- linux-2.6.orig/arch/arm/Makefile	2006-12-10 16:38:20.000000000 +0100
+++ linux-2.6/arch/arm/Makefile	2006-12-10 23:26:36.000000000 +0100
@@ -118,6 +118,9 @@ endif
  machine-$(CONFIG_ARCH_OMAP2)	   := omap2
   incdir-$(CONFIG_ARCH_OMAP)	   := omap
  machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410
+ifeq ($(CONFIG_S3C24XX_IPAQ_OFFSETS),y)
+ textofs-$(CONFIG_ARCH_S3C2410)	   := 0x00208000
+endif
  machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x
  machine-$(CONFIG_ARCH_VERSATILE)  := versatile
  machine-$(CONFIG_ARCH_IMX)	   := imx
Index: linux-2.6/arch/arm/mach-s3c2410/Kconfig
===================================================================
--- linux-2.6.orig/arch/arm/mach-s3c2410/Kconfig	2006-12-10 16:38:20.000000000 +0100
+++ linux-2.6/arch/arm/mach-s3c2410/Kconfig	2006-12-10 23:28:30.000000000 +0100
@@ -47,9 +47,16 @@ config PM_H1940
 	help
 	  Internal node for H1940 and related PM
 
+config S3C24XX_IPAQ_OFFSETS
+	bool
+	default n
+	help
+	  Change zreladdr and textofs for s3c24xx based ipaqs
+
 config ARCH_H1940
 	bool "IPAQ H1940"
 	select CPU_S3C2410
+	select S3C24XX_IPAQ_OFFSETS
 	select PM_H1940
 	help
 	  Say Y here if you are using the HP IPAQ H1940
@@ -123,6 +130,7 @@ config MACH_RX3715
 	bool "HP iPAQ rx3715"
 	select CPU_S3C2440
 	select PM_H1940
+	select S3C24XX_IPAQ_OFFSETS
 	help
 	  Say Y here if you are using the HP iPAQ rx3715.