[patch][2.5][cft] OSS cs4232.c fix compilation

• Next message: Lukas Hejtmanek: "Re: BUG: 2.5.52-bk4"
• Previous message: Andrew Morton: "Re: [BENCHMARK] scheduler tunables with contest - prio_bonus_ratio"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Burton,
        You'll need the ad1848 patches i posted earlier too.

Regards,
        Zwane

Index: linux-2.5.52/sound/oss/cs4232.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.52/sound/oss/cs4232.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cs4232.c
--- linux-2.5.52/sound/oss/cs4232.c 16 Dec 2002 05:17:07 -0000 1.1.1.1
+++ linux-2.5.52/sound/oss/cs4232.c 19 Dec 2002 22:44:52 -0000
@@ -357,7 +357,7 @@

 /* All cs4232 based cards have the main ad1848 card either as CSC0000 or
  * CSC0100. */
-static const struct pnp_id cs4232_pnp_table[] = {
+static const struct pnp_device_id cs4232_pnp_table[] = {
         { .id = "CSC0100", .driver_data = 0 },
         { .id = "CSC0000", .driver_data = 0 },
         /* Guillemot Turtlebeach something appears to be cs4232 compatible
@@ -368,7 +368,7 @@

 /*MODULE_DEVICE_TABLE(isapnp, isapnp_cs4232_list);*/

-static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_id *card_id, const struct pnp_id *dev_id)
+static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 {
         struct address_info *isapnpcfg;

@@ -386,20 +386,19 @@
                 return -ENODEV;
         }
         attach_cs4232(isapnpcfg);
- pci_set_drvdata(dev,isapnpcfg);
+ pnp_set_drvdata(dev,isapnpcfg);
         return 0;
 }

 static void cs4232_pnp_remove(struct pnp_dev *dev)
 {
- struct address_info *cfg = (struct address_info*) dev->driver_data;
+ struct address_info *cfg = pnp_get_drvdata(dev);
         if (cfg)
                 unload_cs4232(cfg);
 }

 static struct pnp_driver cs4232_driver = {
         .name = "cs4232",
- .card_id_table = NULL,
         .id_table = cs4232_pnp_table,
         .probe = cs4232_pnp_probe,
         .remove = cs4232_pnp_remove,

-- 
function.linuxpower.ca
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Lukas Hejtmanek: "Re: BUG: 2.5.52-bk4"
• Previous message: Andrew Morton: "Re: [BENCHMARK] scheduler tunables with contest - prio_bonus_ratio"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Mon Dec 23 2002 - 22:00:25 EST