Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[sfrench/cifs-2.6.git] / include / linux / scx200.h

diff --git a/include/linux/scx200.h b/include/linux/scx200.h
index 693c0557e70bdf6b13baa898a4dca5c82b8ae919..de466e11e271a92df49206d317a5ce6572f3d6af 100644 (file)
--- a/include/linux/scx200.h
+++ b/include/linux/scx200.h
@@ -32,7 +32,7 @@ extern unsigned scx200_cb_base;
 
 /* High Resolution Timer */
 #define SCx200_TIMER_OFFSET 0x08
-#define SCx200_TIMER_SIZE 0x05
+#define SCx200_TIMER_SIZE 0x06
 
 /* Clock Generators */
 #define SCx200_CLOCKGEN_OFFSET 0x10