Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / sound / oss / cs4232.c

diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c
index c7f86f09c28da1979a5c0e6de7cfde38fd1309d5..de40e21bf2798c6d248de7f8dbf6d0fc643cf0ab 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>
@@ -405,11 +404,11 @@ static const struct pnp_device_id cs4232_pnp_table[] = {
 
 MODULE_DEVICE_TABLE(pnp, cs4232_pnp_table);
 
-static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
+static int __init cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 {
        struct address_info *isapnpcfg;
 
-       isapnpcfg=(struct address_info*)kmalloc(sizeof(*isapnpcfg),GFP_KERNEL);
+       isapnpcfg = kmalloc(sizeof(*isapnpcfg),GFP_KERNEL);
        if (!isapnpcfg)
                return -ENOMEM;