--- main.c.orig 2007-02-10 01:48:38.000000000 +0000
+++ main.c      2007-02-10 12:03:37.000000000 +0000
@@ -82,6 +82,10 @@
 
 #ifdef BUTTON_REC
 #define SETTINGS_RESET BUTTON_REC
+#else
+#if (CONFIG_KEYPAD == GIGABEAT_PAD)
+#define SETTINGS_RESET BUTTON_A
+#endif
 #endif
 
 #ifdef CONFIG_TUNER
@@ -447,9 +451,10 @@
     }
 
 #if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-    (CONFIG_KEYPAD == IRIVER_H10_PAD) || (CONFIG_KEYPAD == GIGABEAT_PAD)
+    (CONFIG_KEYPAD == IRIVER_H10_PAD)
 #ifdef SETTINGS_RESET
-    /* Reset settings if holding the rec button. */
+    /* Reset settings if holding the reset button. (Rec on Archos,
+       A on Gigabeat) */
     if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET)
 #else
     /* Reset settings if the hold button is turned on */