2 files changed, 7 insertions, 8 deletions

diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index 03e2abf64a7c..7ff484f55b02 100644
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -97,11 +97,6 @@
 #define AD1848_CALIB_IN_PROGRESS 0x20   /* auto calibrate in progress */
 #define AD1848_DMA_REQUEST      0x10    /* DMA request in progress */
 
-/* IBM Thinkpad specific stuff */
-#define AD1848_THINKPAD_CTL_PORT1               0x15e8
-#define AD1848_THINKPAD_CTL_PORT2               0x15e9
-#define AD1848_THINKPAD_CS4248_ENABLE_BIT       0x02
-
 /* exported functions */
 
 void snd_ad1848_out(struct snd_wss *chip, unsigned char reg,
@@ -113,7 +108,4 @@ int snd_ad1848_create(struct snd_card *card,
                       unsigned short hardware,
                       struct snd_wss **chip);
 
-int snd_ad1848_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
-const struct snd_pcm_ops *snd_ad1848_get_pcm_ops(int direction);
-
 #endif /* __SOUND_AD1848_H */
diff --git a/include/sound/wss.h b/include/sound/wss.h
index c896f6e1f937..fd01f22825cd 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -71,6 +71,11 @@
 #define WSS_HWSHARE_DMA1        (1<<1)
 #define WSS_HWSHARE_DMA2        (1<<2)
 
+/* IBM Thinkpad specific stuff */
+#define AD1848_THINKPAD_CTL_PORT1               0x15e8
+#define AD1848_THINKPAD_CTL_PORT2               0x15e9
+#define AD1848_THINKPAD_CS4248_ENABLE_BIT       0x02
+
 struct snd_wss {
         unsigned long port;             /* base i/o port */
         struct resource *res_port;
@@ -153,6 +158,8 @@ int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
 int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
 int snd_wss_mixer(struct snd_wss *chip);
 
+const struct snd_pcm_ops *snd_wss_get_pcm_ops(int direction);
+
 int snd_cs4236_create(struct snd_card *card,
                       unsigned long port,
                       unsigned long cport,