X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=sound%2Fparisc%2Fharmony.h;h=2e434523fedff673c4c130ec91e71cf1b1a96c94;hb=0f6a5156dee091466b743c163800708383c15bdb;hp=526c52389de2a62401c5c1fbe7c8ae1c9a7a1471;hpb=5615ca7906aefbdc3318604c89db5931d0a25910;p=powerpc.git

diff --git a/sound/parisc/harmony.h b/sound/parisc/harmony.h
index 526c52389d..2e434523fe 100644
--- a/sound/parisc/harmony.h
+++ b/sound/parisc/harmony.h
@@ -13,7 +13,7 @@ struct harmony_buffer {
         int coherent;
 };
 
-typedef struct snd_card_harmony {
+struct snd_harmony {
         int irq;
 
         unsigned long hpa; /* hard physical address */
@@ -44,15 +44,15 @@ typedef struct snd_card_harmony {
                 unsigned long silence_intr;
         } stats;
 
-        snd_pcm_t *pcm;
-        snd_card_t *card;
-        snd_pcm_substream_t *psubs;
-	snd_pcm_substream_t *csubs;
-        snd_info_entry_t *proc;
+        struct snd_pcm *pcm;
+        struct snd_card *card;
+        struct snd_pcm_substream *psubs;
+	struct snd_pcm_substream *csubs;
+        struct snd_info_entry *proc;
 
         spinlock_t lock;
         spinlock_t mixer_lock;
-} harmony_t;
+};
 
 #define MAX_PCM_DEVICES     1
 #define MAX_PCM_SUBSTREAMS  4