* HAL2 driver Ulf Carlsson <ulfc@thepuffingroup.com>

* Timer API changes/cleanups
* Sequencer API changes/cleanups
  - queue ioctls changed
  - instrument events added

diff --git a/amixer/amixer.c b/amixer/amixer.c
index e71f0fea46291ab00f2d1dd39bbd2038175b0984..79b9228dff76ab124ca9edf90d1cad4fe66b9e58 100644 (file)
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -116,7 +116,7 @@ int info(void)
        printf("  Elements      : %i\n", info.elements);
        printf("  Groups        : %i\n", info.groups);
        printf("  Switches      : %i\n", info.switches);
-       printf("  Attribute     : 0x%x\n", info.attribute);
+       printf("  Attribute     : 0x%x\n", info.attrib);
        snd_mixer_close(handle);
        return 0;
 }

diff --git a/include/aconfig.h.in b/include/aconfig.h.in
index 9c26137c17669e9a0b37dcf64cb9844ea90c9022..250a04bb826160c32d733bb0158f392829c9aa2e 100644 (file)
--- a/include/aconfig.h.in
+++ b/include/aconfig.h.in
@@ -15,11 +15,15 @@
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 
-/* Package name */
-#undef PACKAGE
-
 /* Package version */
 #undef VERSION
 
 /* Define if you have the asound library (-lasound).  */
 #undef HAVE_LIBASOUND
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+