Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index de2fcce10ba5..043353bd0600 100644
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -8,6 +8,11 @@
 menuconfig AUXDISPLAY
         depends on PARPORT
         bool "Auxiliary Display support"
+        ---help---
+          Say Y here to get to see options for auxiliary display drivers.
+          This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
 
 if AUXDISPLAY && PARPORT
 
diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c
index cb44cb4f6a47..80bb06105387 100644
--- a/drivers/auxdisplay/cfag12864b.c
+++ b/drivers/auxdisplay/cfag12864b.c
@@ -355,7 +355,7 @@ static int __init cfag12864b_init(void)
 
         cfag12864b_cache = kmalloc(sizeof(unsigned char) *
                 CFAG12864B_SIZE, GFP_KERNEL);
-        if (cfag12864b_buffer == NULL) {
+        if (cfag12864b_cache == NULL) {
                 printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
                         "can't alloc cache buffer (%i bytes)\n",
                         CFAG12864B_SIZE);