lkml.org 
[lkml]   [2011]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled
    On 11/04/2011 10:58 AM, Mark Einon wrote:
    > Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
    > This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.
    >
    > Reported-by: Randy Dunlap <rdunlap@xenotime.net>
    > Signed-off-by: Mark Einon <mark.einon@gmail.com>

    Acked-by: Randy Dunlap <rdunlap@xenotime.net>

    Thanks.

    > ---
    > drivers/staging/et131x/et131x.c | 12 ++++++------
    > 1 files changed, 6 insertions(+), 6 deletions(-)
    >
    > diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
    > index f5f44a0..0c1c6ca 100644
    > --- a/drivers/staging/et131x/et131x.c
    > +++ b/drivers/staging/et131x/et131x.c
    > @@ -4469,6 +4469,12 @@ static int et131x_resume(struct device *dev)
    > return 0;
    > }
    >
    > +static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
    > +#define ET131X_PM_OPS (&et131x_pm_ops)
    > +#else
    > +#define ET131X_PM_OPS NULL
    > +#endif
    > +
    > /* ISR functions */
    >
    > /**
    > @@ -5470,12 +5476,6 @@ err_out:
    > return result;
    > }
    >
    > -static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
    > -#define ET131X_PM_OPS (&et131x_pm_ops)
    > -#else
    > -#define ET131X_PM_OPS NULL
    > -#endif
    > -
    > static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {
    > { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL},
    > { PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL},


    --
    ~Randy
    *** Remember to use Documentation/SubmitChecklist when testing your code ***


    \
     
     \ /
      Last update: 2011-11-04 19:23    [W:0.031 / U:0.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site