On Tue, 29 Mar 2011 09:45:57 -0700 Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote: > On Wed, 30 Mar 2011 01:39:46 +0900 OGAWA Hirofumi wrote: > > > Randy Dunlap <randy.dunlap@xxxxxxxxxx> writes: > > > > >> config PCI_LABEL > > >> bool > > >> select NLS > > >> depends on (DMI || ACPI) > > > > > > What sets/enables it then? > > > or did you mean: > > > def_bool y > > > and in that case, should it be a user-visible & user-changeable kconfig option? > > > > Whoops, last line was missed by copy&paste. It meant > > > > config PCI_LABEL > > bool > > select NLS > > depends on (DMI || ACPI) > > default y > > > > And no, it shouldn't be user-changeable (it would be better to > > invisible in .config. At make *config, already invisible.). Because > > PCI_LABEL is not user config and not used in Makefile. > > > > And yeah, if you like def_bool > > > > config PCI_LABEL > > def_bool y if (DMI || ACPI) > > select NLS > > > > I guess it would work (it should be just syntax sugar and equivalent). > > > This patch seems to work for me. Thanks. > > --- > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > Create a kconfig option symbol for PCI_LABEL and enable it > when DMI || ACPI are enabled. > > Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > --- > drivers/pci/Kconfig | 4 +++- > drivers/pci/Makefile | 4 ++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > --- linux-next-20110328.orig/drivers/pci/Kconfig > +++ linux-next-20110328/drivers/pci/Kconfig > @@ -88,4 +88,6 @@ config PCI_IOAPIC > depends on HOTPLUG > default y > > -select NLS if (DMI || ACPI) > +config PCI_LABEL > + def_bool y if (DMI || ACPI) > + select NLS > --- linux-next-20110328.orig/drivers/pci/Makefile > +++ linux-next-20110328/drivers/pci/Makefile > @@ -56,10 +56,10 @@ obj-$(CONFIG_TILE) += setup-bus.o setup- > # ACPI Related PCI FW Functions > # ACPI _DSM provided firmware instance and string name > # > -obj-$(CONFIG_ACPI) += pci-acpi.o pci-label.o > +obj-$(CONFIG_ACPI) += pci-acpi.o > > # SMBIOS provided firmware instance and labels > -obj-$(CONFIG_DMI) += pci-label.o > +obj-$(CONFIG_PCI_LABEL) += pci-label.o > > # Cardbus & CompactPCI use setup-bus > obj-$(CONFIG_HOTPLUG) += setup-bus.o > Applied to my fixes branch, thanks Randy & Hirofumi-san. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
