This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / core / ioctl32 / seq32.c

diff --git a/sound/core/ioctl32/seq32.c b/sound/core/ioctl32/seq32.c
index c349fea..19c12ce 100644 (file)
--- a/sound/core/ioctl32/seq32.c
+++ b/sound/core/ioctl32/seq32.c
@@ -42,14 +42,13 @@ struct sndrv_seq_port_info32 {
 
        u32 kernel;                     /* reserved for kernel use (must be NULL) */
        u32 flags;              /* misc. conditioning */
-       unsigned char time_queue;       /* queue # for timestamping */
-       char reserved[59];              /* for future use */
+       char reserved[60];              /* for future use */
 };
 
 #define CVT_sndrv_seq_port_info()\
 {\
        COPY(addr);\
-       COPY_ARRAY(name);\
+       memcpy(dst->name, src->name, sizeof(dst->name));\
        COPY(capability);\
        COPY(type);\
        COPY(midi_channels);\
@@ -58,7 +57,6 @@ struct sndrv_seq_port_info32 {
        COPY(read_use);\
        COPY(write_use);\
        COPY(flags);\
-       COPY(time_queue);\
 }
 
 DEFINE_ALSA_IOCTL(seq_port_info);