On Sun, Apr 19, 2009 at 09:20:07AM +0200, Corentin Chary wrote: > Hi, > This patch conflict with > http://git.iksaif.net/?p=acpi4asus.git;a=commitdiff;h=8082f39bb3d4a27c7bb03a76e72c70c86d55117b;hp=7ec0a7290797f57b780f792d12f4bcc19c83aa4f > A quick fix is to do : > > eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6"); > eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7"); > if (ehotk->hotplug_slot) > pci_hp_deregister(ehotk->hotplug_slot); > > but I'm not sure it's correct. > I should have sent a series sooner to avoid that :/ Ok - I'll grab that and rediff. -- Matthew Garrett | mjg59@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html