diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/mfd | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/mfd')
| -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 |