diff -urN -X linux-2.6.13-rc6-mm2/Documentation/dontdiff linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h
--- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h	2005-08-24 01:37:59.000000000 -0400
+++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h	2005-08-24 01:37:37.000000000 -0400
@@ -2,53 +2,51 @@
 #if defined(PASS2)
 /* table of built in synths */
 #define SYNTH_DECL(who) &synth_##who,
-#define  CFG_TEST(name) (name)
 #else
 /* declare extern built in synths */
 #define SYNTH_DECL(who) extern struct spk_synth synth_##who;
 #define PASS2
-#define  CFG_TEST(name) (name)
 #endif
 
-#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC)
+#ifdef CONFIG_SPEAKUP_ACNTPC
 SYNTH_DECL(acntpc)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA)
+#ifdef CONFIG_SPEAKUP_ACNTSA
 SYNTH_DECL(acntsa)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_APOLLO)
+#ifdef CONFIG_SPEAKUP_APOLLO
 SYNTH_DECL(apollo)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR)
+#ifdef CONFIG_SPEAKUP_AUDPTR
 SYNTH_DECL(audptr)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_BNS)
+#ifdef CONFIG_SPEAKUP_BNS
 SYNTH_DECL(bns)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_DECEXT)
+#ifdef CONFIG_SPEAKUP_DECEXT
 SYNTH_DECL(decext)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_DECTLK)
+#ifdef CONFIG_SPEAKUP_DECTLK
 SYNTH_DECL(dectlk)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_DTLK)
+#ifdef CONFIG_SPEAKUP_DTLK
 SYNTH_DECL(dtlk)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_KEYPC)
+#ifdef CONFIG_SPEAKUP_KEYPC
 SYNTH_DECL(keypc)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_LTLK)
+#ifdef CONFIG_SPEAKUP_LTLK
 SYNTH_DECL(ltlk)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN)
+#ifdef CONFIG_SPEAKUP_SFTSYN
 SYNTH_DECL(sftsyn)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT)
+#ifdef CONFIG_SPEAKUP_SPKOUT
 SYNTH_DECL(spkout)
 #endif
-#if CFG_TEST(CONFIG_SPEAKUP_TXPRT)
+#ifdef CONFIG_SPEAKUP_TXPRT
 SYNTH_DECL(txprt)
 #endif
 
 #undef SYNTH_DECL
-#undef CFG_TEST
+#undef