diff --git a/[refs] b/[refs] index 5a3f9b225ba7..6d1d8cdbd7fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fadc1212a53908bc28e6351a40efd148739108b +refs/heads/master: 2d9903621dbfa6524e7e98fded2fae31ef09f484 diff --git a/trunk/drivers/staging/mei/main.c b/trunk/drivers/staging/mei/main.c index 16ae1a8fbbd1..bfd1b46ec748 100644 --- a/trunk/drivers/staging/mei/main.c +++ b/trunk/drivers/staging/mei/main.c @@ -1145,7 +1145,7 @@ static int mei_pci_resume(struct device *device) static SIMPLE_DEV_PM_OPS(mei_pm_ops, mei_pci_suspend, mei_pci_resume); #define MEI_PM_OPS (&mei_pm_ops) #else -#define MIE_PM_OPS NULL +#define MEI_PM_OPS NULL #endif /* CONFIG_PM */ /* * PCI driver structure