diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
| commit | 2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch) | |
| tree | cd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/Kconfig | |
| parent | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (diff) | |
| parent | 323cdfc191b7c1597dc748175062c368568d6af4 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c65c6eb9810d..e85097bceff4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -752,6 +752,8 @@ source "drivers/hwmon/Kconfig" | |||
| 752 | 752 | ||
| 753 | source "drivers/misc/Kconfig" | 753 | source "drivers/misc/Kconfig" |
| 754 | 754 | ||
| 755 | source "drivers/mfd/Kconfig" | ||
| 756 | |||
| 755 | source "drivers/media/Kconfig" | 757 | source "drivers/media/Kconfig" |
| 756 | 758 | ||
| 757 | source "drivers/video/Kconfig" | 759 | source "drivers/video/Kconfig" |