git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.26' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
drivers
/
Kconfig
diff --git
a/drivers/Kconfig
b/drivers/Kconfig
index
d74d9fb
..
59f33fa
100644
(file)
--- a/
drivers/Kconfig
+++ b/
drivers/Kconfig
@@
-60,6
+60,8
@@
source "drivers/power/Kconfig"
source "drivers/hwmon/Kconfig"
source "drivers/hwmon/Kconfig"
+source "drivers/thermal/Kconfig"
+
source "drivers/watchdog/Kconfig"
source "drivers/ssb/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/ssb/Kconfig"
@@
-78,8
+80,12
@@
source "drivers/usb/Kconfig"
source "drivers/mmc/Kconfig"
source "drivers/mmc/Kconfig"
+source "drivers/memstick/Kconfig"
+
source "drivers/leds/Kconfig"
source "drivers/leds/Kconfig"
+source "drivers/accessibility/Kconfig"
+
source "drivers/infiniband/Kconfig"
source "drivers/edac/Kconfig"
source "drivers/infiniband/Kconfig"
source "drivers/edac/Kconfig"
@@
-93,4
+99,6
@@
source "drivers/dca/Kconfig"
source "drivers/auxdisplay/Kconfig"
source "drivers/uio/Kconfig"
source "drivers/auxdisplay/Kconfig"
source "drivers/uio/Kconfig"
+
+source "drivers/xen/Kconfig"
endmenu
endmenu