Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

[mv-sheeva.git] / include / sound / ymfpci.h

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index ec790a9c496f81b226f83360aa3fdca58970eefc..f3514ee96bd9753f64782d89fe978e16c8bd8261 100644 (file)
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -269,9 +269,10 @@ struct snd_ymfpci_pcm {
        enum snd_ymfpci_pcm_type type;
        struct snd_pcm_substream *substream;
        struct snd_ymfpci_voice *voices[2];     /* playback only */
-       unsigned int running: 1;
-       unsigned int output_front: 1;
-       unsigned int output_rear: 1;
+       unsigned int running: 1,
+                    output_front: 1,
+                    output_rear: 1,
+                    swap_rear: 1;
        unsigned int update_pcm_vol;
        u32 period_size;                /* cached from runtime->period_size */
        u32 buffer_size;                /* cached from runtime->buffer_size */
@@ -285,7 +286,7 @@ struct snd_ymfpci {
        int irq;
 
        unsigned int device_id; /* PCI device ID */
-       unsigned int rev;       /* PCI revision */
+       unsigned char rev;      /* PCI revision */
        unsigned long reg_area_phys;
        void __iomem *reg_area_virt;
        struct resource *res_reg_area;
@@ -369,6 +370,9 @@ int snd_ymfpci_create(struct snd_card *card,
                      struct snd_ymfpci ** rcodec);
 void snd_ymfpci_free_gameport(struct snd_ymfpci *chip);
 
+int snd_ymfpci_suspend(struct pci_dev *pci, pm_message_t state);
+int snd_ymfpci_resume(struct pci_dev *pci);
+
 int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);
 int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);
 int snd_ymfpci_pcm_spdif(struct snd_ymfpci *chip, int device, struct snd_pcm **rpcm);