[PATCH 0/2] x86 - Move laptop drivers out of x86 Kconfig

[PATCH 0/2] x86 - Move laptop drivers out of x86 Kconfig

[Carlos Corbacho]

The following patch series moves the two laptop drivers from x86 Kconfig (i8k
and toshiba) to drivers/char, which is where the source for them lives anyway.

Given they are not x86 processor features, the x86 Kconfig menu is not really
an appropriate place for them to live.

This is against Linus latest tree, since x86 git seems to be missing an
earlier Kconfig patch for I8K that dropped the x86_32 limitation.

-Carlos
---

Carlos Corbacho (2):
      toshiba - Move Kconfig entry to drivers/char
      i8k - Move Kconfig entry to drivers/char


 arch/x86/Kconfig     |   36 ------------------------------------
 drivers/char/Kconfig |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 36 deletions(-)

-- 
E-Mail: carlos@strangeworlds.co.uk
Web: strangeworlds.co.uk
GPG Key ID: 0x23EE722D

[PATCH 1/2] i8k - Move Kconfig entry to drivers/char

[Carlos Corbacho]

The source code for this driver is currently located in drivers/char, and
given that this is not an x86 processor feature, it shouldn't live in the
x86 Kconfig.

So lets move it to the Kconfig for drivers/char instead, and just add
a dependency on x86.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
CC: Massimo Dal Zotto <dz@debian.org>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
---

 arch/x86/Kconfig     |   20 --------------------
 drivers/char/Kconfig |   21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)


diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c95482b..beaf268 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -632,26 +632,6 @@ config TOSHIBA
 	  Say Y if you intend to run this kernel on a Toshiba portable.
 	  Say N otherwise.
 
-config I8K
-	tristate "Dell laptop support"
-	---help---
-	  This adds a driver to safely access the System Management Mode
-	  of the CPU on the Dell Inspiron 8000. The System Management Mode
-	  is used to read cpu temperature and cooling fan status and to
-	  control the fans on the I8K portables.
-
-	  This driver has been tested only on the Inspiron 8000 but it may
-	  also work with other Dell laptops. You can force loading on other
-	  models by passing the parameter `force=1' to the module. Use at
-	  your own risk.
-
-	  For information on utilities to make use of this driver see the
-	  I8K Linux utilities web site at:
-	  <http://people.debian.org/~dz/i8k/>
-
-	  Say Y if you intend to run this kernel on a Dell Inspiron 8000.
-	  Say N otherwise.
-
 config X86_REBOOTFIXUPS
 	def_bool n
 	prompt "Enable X86 board specific fixups for reboot"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f01ac9a..37861c4 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -867,6 +867,27 @@ config APPLICOM
 
 	  If unsure, say N.
 
+config I8K
+	tristate "Dell laptop support"
+	depends on X86
+	---help---
+	  This adds a driver to safely access the System Management Mode
+	  of the CPU on the Dell Inspiron 8000. The System Management Mode
+	  is used to read cpu temperature and cooling fan status and to
+	  control the fans on the I8K portables.
+
+	  This driver has been tested only on the Inspiron 8000 but it may
+	  also work with other Dell laptops. You can force loading on other
+	  models by passing the parameter `force=1' to the module. Use at
+	  your own risk.
+
+	  For information on utilities to make use of this driver see the
+	  I8K Linux utilities web site at:
+	  <http://people.debian.org/~dz/i8k/>
+
+	  Say Y if you intend to run this kernel on a Dell Inspiron 8000.
+	  Say N otherwise.
+
 config SONYPI
 	tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
 	depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT

[PATCH 2/2] toshiba - Move Kconfig entry to drivers/char

[Carlos Corbacho]

The source code for this driver is currently located in drivers/char, and
given that this is not an x86 processor feature, it shouldn't live in the
x86 Kconfig.

So lets move it to the Kconfig for drivers/char instead.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
CC: Jonathan Buzzard <jonathan@buzzard.org.uk>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
---

 arch/x86/Kconfig     |   16 ----------------
 drivers/char/Kconfig |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)


diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index beaf268..01ad8d2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -616,22 +616,6 @@ config VM86
           XFree86 to initialize some video cards via BIOS. Disabling this
           option saves about 6k.
 
-config TOSHIBA
-	tristate "Toshiba Laptop support"
-	depends on X86_32
-	---help---
-	  This adds a driver to safely access the System Management Mode of
-	  the CPU on Toshiba portables with a genuine Toshiba BIOS. It does
-	  not work on models with a Phoenix BIOS. The System Management Mode
-	  is used to set the BIOS and power saving options on Toshiba portables.
-
-	  For information on utilities to make use of this driver see the
-	  Toshiba Linux utilities web site at:
-	  <http://www.buzzard.org.uk/toshiba/>.
-
-	  Say Y if you intend to run this kernel on a Toshiba portable.
-	  Say N otherwise.
-
 config X86_REBOOTFIXUPS
 	def_bool n
 	prompt "Enable X86 board specific fixups for reboot"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 37861c4..aa3ac8e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -901,6 +901,22 @@ config SONYPI
 	  To compile this driver as a module, choose M here: the
 	  module will be called sonypi.
 
+config TOSHIBA
+	tristate "Toshiba Laptop support"
+	depends on X86_32
+	---help---
+	  This adds a driver to safely access the System Management Mode of
+	  the CPU on Toshiba portables with a genuine Toshiba BIOS. It does
+	  not work on models with a Phoenix BIOS. The System Management Mode
+	  is used to set the BIOS and power saving options on Toshiba portables.
+
+	  For information on utilities to make use of this driver see the
+	  Toshiba Linux utilities web site at:
+	  <http://www.buzzard.org.uk/toshiba/>.
+
+	  Say Y if you intend to run this kernel on a Toshiba portable.
+	  Say N otherwise.
+
 config GPIO_TB0219
 	tristate "TANBAC TB0219 GPIO support"
 	depends on TANBAC_TB022X

Re: [PATCH 0/2] x86 - Move laptop drivers out of x86 Kconfig

[Ingo Molnar]

* Carlos Corbacho <carlos@strangeworlds.co.uk> wrote:

> The following patch series moves the two laptop drivers from x86 
> Kconfig (i8k and toshiba) to drivers/char, which is where the source 
> for them lives anyway.
> 
> Given they are not x86 processor features, the x86 Kconfig menu is not 
> really an appropriate place for them to live.
> 
> This is against Linus latest tree, since x86 git seems to be missing 
> an earlier Kconfig patch for I8K that dropped the x86_32 limitation.

the x86 bits:

  Acked-by: Ingo Molnar <mingo@elte.hu>

i suspect this should be merged by the char driver tree which is 
affected by the addition of these new entries.

	Ingo

Re: [PATCH 0/2] x86 - Move laptop drivers out of x86 Kconfig

[Carlos Corbacho]

On Sunday 17 February 2008 18:20:08 Ingo Molnar wrote:
> i suspect this should be merged by the char driver tree which is
> affected by the addition of these new entries.

Where is such a tree, and who's responsible for it though? I grep'ed 
MAINTAINERS and didn't turn up anyone.

-Carlos
-- 
E-Mail: carlos@strangeworlds.co.uk
Web: strangeworlds.co.uk
GPG Key ID: 0x23EE722D

Re: [PATCH 0/2] x86 - Move laptop drivers out of x86 Kconfig

[Ingo Molnar]

* Carlos Corbacho <carlos@strangeworlds.co.uk> wrote:

> On Sunday 17 February 2008 18:20:08 Ingo Molnar wrote:

> > i suspect this should be merged by the char driver tree which is 
> > affected by the addition of these new entries.
> 
> Where is such a tree, and who's responsible for it though? I grep'ed 
> MAINTAINERS and didn't turn up anyone.

Andrew i suspect in that case?

	Ingo