diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 07:55:25 (GMT) |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 07:55:25 (GMT) |
commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
tree | a3523fa77e07854db3b8089e3066a55ea997060c /drivers/char/Kconfig | |
parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
download | linux-fsl-qoriq-7755726fe90a8b253659756e6de68c1a55aa427f.tar.xz |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r-- | drivers/char/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 6f31c94..e023682 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -502,7 +502,7 @@ config BRIQ_PANEL config BFIN_OTP tristate "Blackfin On-Chip OTP Memory Support" - depends on BLACKFIN && (BF52x || BF54x) + depends on BLACKFIN && (BF51x || BF52x || BF54x) default y help If you say Y here, you will get support for a character device @@ -669,7 +669,7 @@ config VIRTIO_CONSOLE config HVCS tristate "IBM Hypervisor Virtual Console Server support" - depends on PPC_PSERIES + depends on PPC_PSERIES && HVC_CONSOLE help Partitionable IBM Power5 ppc64 machines allow hosting of firmware virtual consoles from one Linux partition by |