diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 15:55:48 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 15:55:48 +0200 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/Kconfig | |
| parent | [JFFS2] Add support for write-buffer verification. (diff) | |
| parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
| download | linux-db1b39d8b860e3716620c225bc86e0ec41764e34.tar.xz linux-db1b39d8b860e3716620c225bc86e0ec41764e34.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 050323fd79e9..7916f4b86d23 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -24,8 +24,6 @@ source "drivers/scsi/Kconfig" source "drivers/ata/Kconfig" -source "drivers/cdrom/Kconfig" - source "drivers/md/Kconfig" source "drivers/message/fusion/Kconfig" @@ -54,6 +52,8 @@ source "drivers/spi/Kconfig" source "drivers/w1/Kconfig" +source "drivers/power/Kconfig" + source "drivers/hwmon/Kconfig" source "drivers/mfd/Kconfig" |