Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

2 files changed, 1 insertions, 2 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index 5d184be0ff72..bab3ff457e40 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -188,8 +188,6 @@ struct snd_minor {
         int device;                     /* device number */
         const struct file_operations *f_ops;    /* file operations */
         void *private_data;             /* private data for f_ops->open */
-        char name[0];                   /* device name (keep at the end of
-                                                                structure) */
 };
 
 /* sound.c */
diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index 80b2979c0cba..685928e6f65a 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -1704,6 +1704,7 @@ struct snd_cs46xx {
         int acpi_port;
         struct snd_kcontrol *eapd_switch; /* for amplifier hack */
         int accept_valid;       /* accept mmap valid (for OSS) */
+        int in_suspend;
 
         struct gameport *gameport;