Index: firmware/export/s5l8700.h
===================================================================
--- firmware/export/s5l8700.h	(revision 23722)
+++ firmware/export/s5l8700.h	(working copy)
@@ -312,7 +312,7 @@
 #define TDCNT                   (*(REG32_PTR_T)(0x3C700074))     /* Counter register */
 #define FIVE_USEC_TIMER         (((*(REG32_PTR_T)(0x3C700080)) << 32) \
                                 | (*(REG32_PTR_T)(0x3C700084)))  /* 64bit 5usec timer */     
-#define USEC_TIMER              ((*(REG32_PTR_T)(0x3C700084)) * 5) /* lower 32 bits of the above as a usec timer */     
+#define USEC_TIMER              (((*(REG32_PTR_T)(0x3C700080))>>31)|1) * ((*(REG32_PTR_T)(0x3C700084)) * 5) /* lower 32 bits of the above as a usec timer */     
 
 /* 12. NAND FLASH CONTROLER */
 #if CONFIG_CPU==S5L8701
Index: firmware/export/config-ipodnano2g.h
===================================================================
--- firmware/export/config-ipodnano2g.h	(revision 23722)
+++ firmware/export/config-ipodnano2g.h	(working copy)
@@ -58,6 +58,12 @@
 
 /* define this if the unit uses a scrollwheel for navigation */
 #define HAVE_SCROLLWHEEL
+/* define to activate advanced wheel acceleration code */
+#define HAVE_WHEEL_ACCELERATION
+/* define from which rotation speed [degree/sec] on the acceleration starts */
+#define WHEEL_ACCEL_START 270
+/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */
+#define WHEEL_ACCELERATION 3
 
 /* Define this if you can detect headphones */
 #define HAVE_HEADPHONE_DETECTION