lkml.org 
[lkml]   [2003]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] PnP Changes for 2.5.64
    # This is a BitKeeper generated patch for the following project:
    # Project Name: Linux kernel tree
    # This patch format is intended for GNU patch command version 2.5 or higher.
    # This patch includes the following deltas:
    # ChangeSet 1.1082 -> 1.1083
    # sound/oss/sb_card.c 1.15 -> 1.16
    #
    # The following is the BitKeeper ChangeSet Log
    # --------------------------------------------
    # 03/03/09 ambx1@neo.rr.com 1.1083
    # OSS SB driver Updates
    #
    # Compatibility update for the latest changes.
    # --------------------------------------------
    #
    diff -Nru a/sound/oss/sb_card.c b/sound/oss/sb_card.c
    --- a/sound/oss/sb_card.c Sun Mar 9 23:47:34 2003
    +++ b/sound/oss/sb_card.c Sun Mar 9 23:47:34 2003
    @@ -252,14 +252,14 @@
    "dma=%d, dma16=%d\n", scc->conf.io_base, scc->conf.irq,
    scc->conf.dma, scc->conf.dma2);

    - pnpc_set_drvdata(card, scc);
    + pnp_set_card_drvdata(card, scc);

    return sb_register_oss(scc, &sbmo);
    }

    static void sb_pnp_remove(struct pnp_card *card)
    {
    - struct sb_card_config *scc = pnpc_get_drvdata(card);
    + struct sb_card_config *scc = pnp_get_card_drvdata(card);

    if(!scc)
    return;
    @@ -269,7 +269,7 @@
    sb_unload(scc);
    }

    -static struct pnpc_driver sb_pnp_driver = {
    +static struct pnp_card_driver sb_pnp_driver = {
    .name = "OSS SndBlstr", /* 16 character limit */
    .id_table = sb_pnp_card_table,
    .probe = sb_pnp_probe,
    @@ -295,7 +295,7 @@

    #ifdef CONFIG_PNP_CARD
    if(pnp) {
    - pres = pnpc_register_driver(&sb_pnp_driver);
    + pres = pnp_register_card_driver(&sb_pnp_driver);
    }
    #endif
    printk(KERN_INFO "sb: Init: Done\n");
    @@ -316,7 +316,7 @@
    }

    #ifdef CONFIG_PNP_CARD
    - pnpc_unregister_driver(&sb_pnp_driver);
    + pnp_unregister_card_driver(&sb_pnp_driver);
    #endif

    if (smw_free) {
    -
    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/
    \
     
     \ /
      Last update: 2005-03-22 13:33    [W:0.022 / U:0.772 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site