summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-08-17 18:16:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-08-17 18:16:28 +0100
commit29c08460d472e427cec5e5dcb12ec74c923f8250 (patch)
tree9d8557fe9cf123920c3ceb023274e763e5f208b0 /sound
parent9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff)
parentbaa28e3530375e0bef2c53243634a1c78f5c02f3 (diff)
downloadlinux-stable-29c08460d472e427cec5e5dcb12ec74c923f8250.tar.gz
linux-stable-29c08460d472e427cec5e5dcb12ec74c923f8250.tar.bz2
linux-stable-29c08460d472e427cec5e5dcb12ec74c923f8250.zip
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/s3c24xx/s3c24xx-ac97.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-ac97.h b/sound/soc/s3c24xx/s3c24xx-ac97.h
index a96dcadf28b4..e96f941a810b 100644
--- a/sound/soc/s3c24xx/s3c24xx-ac97.h
+++ b/sound/soc/s3c24xx/s3c24xx-ac97.h
@@ -20,12 +20,6 @@
#define AC_CMD_ADDR(x) (x << 16)
#define AC_CMD_DATA(x) (x & 0xffff)
-#ifdef CONFIG_CPU_S3C2440
-#define IRQ_S3C244x_AC97 IRQ_S3C2440_AC97
-#else
-#define IRQ_S3C244x_AC97 IRQ_S3C2443_AC97
-#endif
-
extern struct snd_soc_dai s3c2443_ac97_dai[];
#endif /*S3C24XXAC97_H_*/