Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index db2fbe2d4146541187c3630a6d6137d242770573..1f69743b12ec036239fa6fe05540cec600c5b4b9 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -112,8 +112,8 @@ config IBM_ASM
 
          WARNING: This software may not be supported or function
          correctly on your IBM server. Please consult the IBM ServerProven
-         website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for
-         information on the specific driver level and support statement
+         website <http://www-03.ibm.com/systems/info/x86servers/serverproven/compat/us/>
+         for information on the specific driver level and support statement
          for your IBM server.
 
 config PHANTOM
@@ -385,7 +385,7 @@ config BMP085
        depends on I2C && SYSFS
        help
          If you say yes here you get support for the Bosch Sensortec
-         BMP086 digital pressure sensor.
+         BMP085 digital pressure sensor.
 
          To compile this driver as a module, choose M here: the
          module will be called bmp085.