Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7fbb44b..5d5546c 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,5 +1,5 @@
 # For a description of the syntax of this configuration file,
 # For a description of the syntax of this configuration file,

-# see Documentation/kbuild/config-language.txt.
+# see Documentation/kbuild/kconfig-language.txt.

 
 mainmenu "Linux/Xtensa Kernel Configuration"
 
 
 mainmenu "Linux/Xtensa Kernel Configuration"
 


@@ -174,11 +174,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.linuxdoc.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't
-

 source "drivers/pci/Kconfig"
 
 config HOTPLUG
 source "drivers/pci/Kconfig"
 
 config HOTPLUG