[parisc-linux] Merge error in pa55 tree ??

[Alan Cox]

diff -u --new-file --recursive --exclude-from /usr/src/exclude
linux.vanilla/ar
--- linux.vanilla/arch/ia64/kernel/perfmon.c    Fri Nov  9 22:26:17 2001
+++ linux-hppa/arch/ia64/kernel/perfmon.c       Wed Aug 15 18:07:26 2001
@@ -38,7 +38,7 @@  
 
 #ifdef CONFIG_PERFMON
 
-#define PFM_VERSION            "0.3"
+#define PFM_VERSION            "0.2"
 #define PFM_SMPL_HDR_VERSION   1
 
 #define PMU_FIRST_COUNTER      4       /* first generic counter */
@@ -52,7 +52,6 @@
 #define PFM_DISABLE            0xa6    /* freeze only */
 #define PFM_RESTART            0xcf
 #define PFM_CREATE_CONTEXT     0xa7