Remove the deprecated cli() sti() functions

[linux-2.6] / include / asm-arm / arch-s3c2410 / audio.h

diff --git a/include/asm-arm/arch-s3c2410/audio.h b/include/asm-arm/arch-s3c2410/audio.h
index 0d276e67f2fb23bb06d4853e3562234fb2ff0699..0a6977fb57701a6f0667ad9a6a802678b6de5c0f 100644 (file)
--- a/include/asm-arm/arch-s3c2410/audio.h
+++ b/include/asm-arm/arch-s3c2410/audio.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/audio.h
  *
- * (c) 2004-2005 Simtec Electronics
+ * Copyright (c) 2004-2005 Simtec Electronics
  *     http://www.simtec.co.uk/products/SWLINUX/
  *     Ben Dooks <ben@simtec.co.uk>
  *
@@ -9,10 +9,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Changelog:
- *     20-Nov-2004 BJD  Created file
- *     07-Mar-2005 BJD  Added suspend/resume calls
 */
 
 #ifndef __ASM_ARCH_AUDIO_H
@@ -35,9 +31,9 @@ struct s3c24xx_iis_ops {
        int     (*suspend)(struct s3c24xx_iis_ops *me);
        int     (*resume)(struct s3c24xx_iis_ops *me);
 
-       int     (*open)(struct s3c24xx_iis_ops *me, snd_pcm_substream_t *strm);
-       int     (*close)(struct s3c24xx_iis_ops *me, snd_pcm_substream_t *strm);
-       int     (*prepare)(struct s3c24xx_iis_ops *me, snd_pcm_substream_t *strm, snd_pcm_runtime_t *rt);
+       int     (*open)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
+       int     (*close)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm);
+       int     (*prepare)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm, struct snd_pcm_runtime *rt);
 };
 
 struct s3c24xx_platdata_iis {