diff --git a/[refs] b/[refs]
index 8b41b51e1d0d..dbe9fad4b26a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 936bb14ce9ecb3b17251f3589b59dd23419d2cb7
+refs/heads/master: edd023d0b86b599a8e89c1c014911129210fb955
diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
index ec03341d2bd8..6adf86497648 100644
--- a/trunk/drivers/ide/Kconfig
+++ b/trunk/drivers/ide/Kconfig
@@ -383,6 +383,9 @@ config BLK_DEV_OFFBOARD
 config BLK_DEV_GENERIC
 	tristate "Generic PCI IDE Chipset Support"
 	depends on BLK_DEV_IDEPCI
+        help
+          This option provides generic support for various PCI IDE Chipsets
+          which otherwise might not be supported.
 
 config BLK_DEV_OPTI621
 	tristate "OPTi 82C621 chipset enhanced support (EXPERIMENTAL)"