diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/mfd/Kconfig | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'drivers/mfd/Kconfig')
| -rw-r--r-- | drivers/mfd/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index b550267c8d5e..257277394f8c 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
| @@ -81,7 +81,7 @@ config MFD_TMIO | |||
| 81 | 81 | ||
| 82 | config MFD_T7L66XB | 82 | config MFD_T7L66XB |
| 83 | bool "Support Toshiba T7L66XB" | 83 | bool "Support Toshiba T7L66XB" |
| 84 | depends on ARM | 84 | depends on ARM && HAVE_CLK |
| 85 | select MFD_CORE | 85 | select MFD_CORE |
| 86 | select MFD_TMIO | 86 | select MFD_TMIO |
| 87 | help | 87 | help |
| @@ -89,7 +89,7 @@ config MFD_T7L66XB | |||
| 89 | 89 | ||
| 90 | config MFD_TC6387XB | 90 | config MFD_TC6387XB |
| 91 | bool "Support Toshiba TC6387XB" | 91 | bool "Support Toshiba TC6387XB" |
| 92 | depends on ARM | 92 | depends on ARM && HAVE_CLK |
| 93 | select MFD_CORE | 93 | select MFD_CORE |
| 94 | select MFD_TMIO | 94 | select MFD_TMIO |
| 95 | help | 95 | help |