diff -urN -X /home/arm/dontdiff_tml_arm /home/download/kernels/linux-2.4.19-rmk2-vanilla/drivers/char/Makefile linux-2.4.19-rmk2/drivers/char/Makefile
diff -urN -X /home/arm/dontdiff_tml_arm /home/download/kernels/linux-2.4.19-rmk2-vanilla/drivers/char/Makefile linux-2.4.19-rmk2/drivers/char/Makefile
--- /home/download/kernels/linux-2.4.19-rmk2-vanilla/drivers/char/Makefile	2002-10-02 22:05:14.000000000 -0700
+++ linux-2.4.19-rmk2/drivers/char/Makefile	2002-10-06 15:11:25.000000000 -0700
@@ -229,6 +229,7 @@
 obj-$(CONFIG_RTC) += rtc.o
 obj-$(CONFIG_EFI_RTC) += efirtc.o
 obj-$(CONFIG_SA1100_RTC) += sa1100-rtc.o
+obj-$(CONFIG_PSIONW_RTC) += psionw-rtc.o
 ifeq ($(CONFIG_PPC),)
   obj-$(CONFIG_NVRAM) += nvram.o
 endif
@@ -303,6 +304,31 @@
 obj-y		+= ../acorn/char/acorn-char.o
 endif
 
+ifeq ($(CONFIG_ARCH_PSIONW),y)
+  KEYBD    =keyboard_psion.o
+  CONSOLE  =console.o
+  obj-y += keyboard_psion.o
+  ifeq ($(CONFIG_PSION_KBD_UK),y)
+    KEYMAP =keymap_psion.o
+    obj-y += keymap_psion.o
+  endif
+  ifeq ($(CONFIG_PSION_KBD_US),y)
+    KEYMAP =keymap_psion_us.o
+    obj-y += keymap_psion_us.o
+  endif
+  ifeq ($(CONFIG_PSION_KBD_DE),y)
+    KEYMAP =keymap_psion_de.o
+    obj-y += keymap_psion_de.o
+  endif
+  ifeq ($(CONFIG_PSION_KBD_FR),y)
+    KEYMAP =keymap_psion_fr.o
+    obj-y += keymap_psion_fr.o
+  endif
+  ifeq ($(CONFIG_PROCFS_PSION),y)
+   obj-y += psionw_procfs.o
+  endif
+endif
+
 include $(TOPDIR)/Rules.make
 
 fastdep:
@@ -322,3 +348,16 @@
 
 qtronixmap.c: qtronixmap.map
 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+
+keymap_psion.c: keymap_psion.map
+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+
+keymap_psion_us.c: keymap_psion_us.map
+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+
+keymap_psion_de.c: keymap_psion_de.map
+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+
+keymap_psion_fr.c: keymap_psion_fr.map
+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+