Merge branch 'master' into gfs2

[linux-2.6-omap-h63xx.git] / sound / oss / cs4232.c

diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index 80f6c08e26e7fa73d40a9a8ee24e818d98e08355..b6924c7f1484f5c6c01f1684d3654dec21f7f0fe 100644 (file)
--- a/sound/oss/cs4232.c
+++ b/sound/oss/cs4232.c
@@ -47,7 +47,6 @@
  *     Marcus Meissner         Added ISA PnP support.
  */
 
-#include <linux/config.h>
 #include <linux/pnp.h>
 #include <linux/module.h>
 #include <linux/init.h>