[Gc-linux-cvs] linux/drivers Kconfig,1.2,1.3 Makefile,1.24,1.25

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

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4241/drivers

Modified Files:
	Kconfig Makefile 
Log Message:
Merge 2.6.26.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	13 Sep 2008 19:42:53 -0000	1.24
+++ Makefile	14 Sep 2008 19:20:28 -0000	1.25
@@ -70,6 +70,7 @@
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
+obj-$(CONFIG_ACCESSIBILITY)	+= accessibility/
 obj-$(CONFIG_ISDN)		+= isdn/
 obj-$(CONFIG_EDAC)		+= edac/
 obj-$(CONFIG_MCA)		+= mca/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	13 Sep 2008 19:42:53 -0000	1.2
+++ Kconfig	14 Sep 2008 19:20:28 -0000	1.3
@@ -86,6 +86,8 @@
 
 source "drivers/leds/Kconfig"
 
+source "drivers/accessibility/Kconfig"
+
 source "drivers/infiniband/Kconfig"
 
 source "drivers/edac/Kconfig"
@@ -99,4 +101,6 @@
 source "drivers/auxdisplay/Kconfig"
 
 source "drivers/uio/Kconfig"
+
+source "drivers/xen/Kconfig"
 endmenu