On Wed, 2012-12-05 at 14:20 -0700, Bjorn Helgaas wrote: > On Wed, Dec 5, 2012 at 2:04 PM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: > > On Wed, 2012-12-05 at 13:58 -0700, Bjorn Helgaas wrote: > >> Use the standard #defines rather than creating local definitions for > >> PCIe Capability ASPM fields. > > > > I'll pick up the iwlwifi ones if you want, or do you want to merge them > > somewhere centrally instead? > > They do depend on a previous patch that adds the #defines to > include/uapi/linux/pci_regs.h > (http://marc.info/?l=linux-pci&m=135474107109010&w=2). > > I think I'll merge at least the PCI core parts of this via my PCI tree > in the v3.8 merge window next week. If it won't cause conflicts for > you, I could include the iwlwifi bits there, too. If it does, at > least the #define will exist and you can merge it at your leisure. Ok, that's fine, feel free to include the iwlwifi bits. Acked-by: Johannes Berg <johannes.berg@xxxxxxxxx> :) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
