From 7a05b591a3de20466a775f62369a42ea0fe1345d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 13 May 2007 21:27:37 -0700 Subject: [SERIAL] SUNHV: Add an ID string. The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller --- drivers/serial/sunhv.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'drivers') diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index 40d48566215..c3a6bd2e795 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c @@ -493,6 +493,10 @@ static struct of_device_id hv_match[] = { .name = "console", .compatible = "qcn", }, + { + .name = "console", + .compatible = "SUNW,sun4v-console", + }, {}, }; MODULE_DEVICE_TABLE(of, hv_match); -- cgit v1.2.3 From 4b5dff76a70cb1d8b935b8b93fe0df0bbe66640d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 13 May 2007 22:22:13 -0700 Subject: [SPARC] SBUS: bbc_i2c.c needs asm/io.h Signed-off-by: David S. Miller --- drivers/sbus/char/bbc_i2c.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 8410587348f..178155bf9db 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "bbc_i2c.h" -- cgit v1.2.3 From 3049f89df13bb8f5ded8737631a6c2dd6209b5ca Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 13 May 2007 22:22:47 -0700 Subject: [SPARC] SBUS: display7seg.c needs asm/io.h Signed-off-by: David S. Miller --- drivers/sbus/char/display7seg.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 2d14a29effe..3279a1b6501 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c @@ -20,6 +20,7 @@ #include /* EBus device */ #include /* OpenProm Library */ #include /* put_/get_user */ +#include #include -- cgit v1.2.3 From ec6fb1ad84551741c14a05918cc0e04dea928fc0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 13 May 2007 23:52:14 -0700 Subject: [SCSI]: Add help text for SCSI_ESP_CORE. Signed-off-by: David S. Miller --- drivers/scsi/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'drivers') diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e62d23f6518..d28c14e23c3 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1757,6 +1757,14 @@ config SCSI_ESP_CORE tristate "ESP Scsi Driver Core" depends on SCSI select SCSI_SPI_ATTRS + help + This is a core driver for NCR53c9x based scsi chipsets, + also known as "ESP" for Emulex Scsi Processor or + Enhanced Scsi Processor. This driver does not exist by + itself, there are front-end drivers which, when enabled, + select and enable this driver. One example is SCSI_SUNESP. + These front-end drivers provide probing, DMA, and register + access support for the core driver. config SCSI_SUNESP tristate "Sparc ESP Scsi Driver" -- cgit v1.2.3 From d0842f40a025521beb48063e02a8cc57ebd075e0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 14 May 2007 04:18:38 -0700 Subject: [VIDEO]: XVR-500 and XVR-2500 need FB=y. Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller --- drivers/video/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index eebcb708cff..4d7485fa553 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1535,7 +1535,7 @@ config FB_LEO config FB_XVR500 bool "Sun XVR-500 3DLABS Wildcat support" - depends on FB && PCI && SPARC64 + depends on (FB = y) && PCI && SPARC64 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT @@ -1548,7 +1548,7 @@ config FB_XVR500 config FB_XVR2500 bool "Sun XVR-2500 3DLABS Wildcat support" - depends on FB && PCI && SPARC64 + depends on (FB = y) && PCI && SPARC64 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT -- cgit v1.2.3