[Gc-linux-cvs] linux/drivers/misc Kconfig, 1.16, 1.17 Makefile, 1.12, 1.13

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/misc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29988/drivers/misc

Modified Files:
	Kconfig Makefile 
Log Message:
Forward to v.2.6.30.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Oct 2009 18:33:47 -0000	1.12
--- Makefile	25 Oct 2009 18:45:35 -0000	1.13
***************
*** 19,22 ****
--- 19,23 ----
  obj-$(CONFIG_SGI_GRU)		+= sgi-gru/
  obj-$(CONFIG_HP_ILO)		+= hpilo.o
+ obj-$(CONFIG_ISL29003)		+= isl29003.o
  obj-$(CONFIG_C2PORT)		+= c2port/
  obj-y				+= eeprom/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Kconfig	25 Oct 2009 18:33:47 -0000	1.16
--- Kconfig	25 Oct 2009 18:45:35 -0000	1.17
***************
*** 19,24 ****
  	help
  	  This option enables device driver support for the PWM channels
! 	  on certain Atmel prcoessors.  Pulse Width Modulation is used for
! 	  purposes including software controlled power-efficent backlights
  	  on LCD displays, motor control, and waveform generation.
  
--- 19,24 ----
  	help
  	  This option enables device driver support for the PWM channels
! 	  on certain Atmel processors.  Pulse Width Modulation is used for
! 	  purposes including software controlled power-efficient backlights
  	  on LCD displays, motor control, and waveform generation.
  
***************
*** 143,147 ****
  	depends on AVR32 || ARCH_AT91
  	---help---
! 	  This option enables device driver support for Atmel Syncronized
  	  Serial Communication peripheral (SSC).
  
--- 143,147 ----
  	depends on AVR32 || ARCH_AT91
  	---help---
! 	  This option enables device driver support for Atmel Synchronized
  	  Serial Communication peripheral (SSC).
  
***************
*** 163,170 ****
  	tristate "Support communication between SGI SSIs"
  	depends on NET
! 	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_64) && SMP
  	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
  	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
! 	select SGI_GRU if (IA64_GENERIC || IA64_SGI_UV || X86_64) && SMP
  	---help---
  	  An SGI machine can be divided into multiple Single System
--- 163,170 ----
  	tristate "Support communication between SGI SSIs"
  	depends on NET
! 	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
  	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
  	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
! 	select SGI_GRU if X86_64 && SMP
  	---help---
  	  An SGI machine can be divided into multiple Single System
***************
*** 190,194 ****
  config SGI_GRU
  	tristate "SGI GRU driver"
! 	depends on (X86_64 || IA64_SGI_UV || IA64_GENERIC) && SMP
  	default n
  	select MMU_NOTIFIER
--- 190,194 ----
  config SGI_GRU
  	tristate "SGI GRU driver"
! 	depends on X86_UV && SMP
  	default n
  	select MMU_NOTIFIER
***************
*** 224,227 ****
--- 224,237 ----
  	laptops.
  
+ config ISL29003
+ 	tristate "Intersil ISL29003 ambient light sensor"
+ 	depends on I2C && SYSFS
+ 	help
+ 	  If you say yes here you get support for the Intersil ISL29003
+ 	  ambient light sensor.
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called isl29003.
+ 
  source "drivers/misc/c2port/Kconfig"
  source "drivers/misc/eeprom/Kconfig"