lkml.org 
[lkml]   [2005]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] yenta: fix YENTA && !CARDBUS build
    (Previous patch left a warning.)

    yenta_socket no longer builds if CONFIG_CARDBUS is disabled. It doesn't
    look like ene_tune_bridge is relevant in the !CARDBUS configuration so
    I've just disabled it.
    yenta: fix build if YENTA && !CARDBUS

    (struct pcmcia_socket).tune_bridge only exists if CONFIG_CARDBUS is set but
    building yenta_socket without CardBus is valid.

    Signed-off-by: David Vrabel <dvrabel@arcom.com>

    Index: linux-2.6-working/drivers/pcmcia/ti113x.h
    ===================================================================
    --- linux-2.6-working.orig/drivers/pcmcia/ti113x.h 2005-10-04 15:08:31.000000000 +0100
    +++ linux-2.6-working/drivers/pcmcia/ti113x.h 2005-10-04 15:42:25.000000000 +0100
    @@ -873,6 +873,7 @@
    * Some fixup code to make everybody happy (TM).
    */

    +#ifdef CONFIG_CARDBUS
    /**
    * set/clear various test bits:
    * Defaults to clear the bit.
    @@ -927,7 +928,6 @@
    config_writeb(socket, ENE_TEST_C9, test_c9);
    }

    -
    static int ene_override(struct yenta_socket *socket)
    {
    /* install tune_bridge() function */
    @@ -935,6 +935,9 @@

    return ti1250_override(socket);
    }
    +#else
    +# define ene_override ti1250_override
    +#endif

    #endif /* _LINUX_TI113X_H */
    \
     
     \ /
      Last update: 2005-10-07 15:45    [W:0.030 / U:97.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site