diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 00:32:24 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 00:32:24 -0400 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /sound/soc/s3c24xx/s3c-ac97.c | |
| parent | 57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/soc/s3c24xx/s3c-ac97.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-ac97.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c-ac97.c b/sound/soc/s3c24xx/s3c-ac97.c index ecf4fd04ae96..31f6d45b6384 100644 --- a/sound/soc/s3c24xx/s3c-ac97.c +++ b/sound/soc/s3c24xx/s3c-ac97.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #define AC_CMD_DATA(x) (x & 0xffff) | 31 | #define AC_CMD_DATA(x) (x & 0xffff) |
| 32 | 32 | ||
| 33 | struct s3c_ac97_info { | 33 | struct s3c_ac97_info { |
| 34 | unsigned state; | ||
| 35 | struct clk *ac97_clk; | 34 | struct clk *ac97_clk; |
| 36 | void __iomem *regs; | 35 | void __iomem *regs; |
| 37 | struct mutex lock; | 36 | struct mutex lock; |