[Pommed-commits] r351 - trunk/pommed

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-08-22 14:05:27 +0000 (Wed, 22 Aug 2007)
New Revision: 351

Modified:
   trunk/pommed/conffile.c
Log:
Fix erroneous mactel/pmac code duplication.


Modified: trunk/pommed/conffile.c
===================================================================
--- trunk/pommed/conffile.c	2007-08-22 14:02:16 UTC (rev 350)
+++ trunk/pommed/conffile.c	2007-08-22 14:05:27 UTC (rev 351)
@@ -67,17 +67,8 @@
     CFG_END()
   };
 
-static cfg_opt_t audio_opts[] =
-  {
-    CFG_STR("card", "default", CFGF_NONE),
-    CFG_INT("init", -1, CFGF_NONE),
-    CFG_INT("step", 10, CFGF_NONE),
-    CFG_STR("volume", "Master", CFGF_NONE),
-    CFG_STR("speakers", "Master", CFGF_NONE),
-    CFG_STR("headphones", "Headphone", CFGF_NONE),
-    CFG_END()
-  };
 #else
+
 static cfg_opt_t lcd_x1600_opts[] =
   {
     CFG_INT("init", -1, CFGF_NONE),
@@ -101,7 +92,9 @@
     CFG_INT("on_batt", 0, CFGF_NONE),
     CFG_END()
   };
+#endif /* __powerpc__ */
 
+
 static cfg_opt_t audio_opts[] =
   {
     CFG_STR("card", "default", CFGF_NONE),
@@ -112,9 +105,7 @@
     CFG_STR("headphones", "Headphone", CFGF_NONE),
     CFG_END()
   };
-#endif /* __powerpc__ */
 
-
 static cfg_opt_t kbd_opts[] =
   {
     CFG_INT("default", 100, CFGF_NONE),