PCI fix

The following changes since commit
bb3c90f0de7b34995b5e35cf5dc97a3d428b3761:

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (2011-04-08 07:36:14 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one rather low priority fix for one of the patches that went in this cycle.

Randy Dunlap (1):
PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig

 drivers/pci/Kconfig  |    4 +++-
 drivers/pci/Makefile |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Thanks,

Jesse Barnes, Intel Open Source Technology Center