From 6a82786302905d467ea8fcc5d7175d06c47f2d76 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Wed, 18 Jan 2006 22:53:09 +0100 Subject: [PATCH] --- yaml --- r: 23238 b: refs/heads/master c: a417bbd33b2ed7a3b2bc78cbadb820079d453328 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/i2c/busses/scx200_acb | 5 +++-- trunk/drivers/i2c/busses/Kconfig | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 42d5d3e51e8b..175341e567d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f933ff504f5b3f0f94b98d69d48fc8d3c1e92267 +refs/heads/master: a417bbd33b2ed7a3b2bc78cbadb820079d453328 diff --git a/trunk/Documentation/i2c/busses/scx200_acb b/trunk/Documentation/i2c/busses/scx200_acb index 08c8cd1df60c..f50e69981ec6 100644 --- a/trunk/Documentation/i2c/busses/scx200_acb +++ b/trunk/Documentation/i2c/busses/scx200_acb @@ -6,9 +6,10 @@ Module Parameters ----------------- * base: int - Base addresses for the ACCESS.bus controllers + Base addresses for the ACCESS.bus controllers on SCx200 and SC1100 devices Description ----------- -Enable the use of the ACCESS.bus controllers of a SCx200 processor. +Enable the use of the ACCESS.bus controller on the Geode SCx200 and +SC1100 processors and the CS5535 and CS5536 Geode companion devices. diff --git a/trunk/drivers/i2c/busses/Kconfig b/trunk/drivers/i2c/busses/Kconfig index ff92735c7c85..1a3bf42351b3 100644 --- a/trunk/drivers/i2c/busses/Kconfig +++ b/trunk/drivers/i2c/busses/Kconfig @@ -389,10 +389,11 @@ config SCx200_I2C_SDA also be specified with a module parameter. config SCx200_ACB - tristate "NatSemi SCx200 ACCESS.bus" + tristate "Geode ACCESS.bus support" depends on I2C && PCI help - Enable the use of the ACCESS.bus controllers of a SCx200 processor. + Enable the use of the ACCESS.bus controllers on the Geode SCx200 and + SC1100 processors and the CS5535 and CS5536 Geode companion devices. If you don't know what to do here, say N.