Merge commit 'origin/master'

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2d854bb9373e46ca465ab36411089f7810944203..650e6b44ce65942471a98bfcbdae8759fe1ffcbc 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -649,6 +649,14 @@ config HVCS
          which will also be compiled when this driver is built as a
          module.
 
+config IBM_BSR
+       tristate "IBM POWER Barrier Synchronization Register support"
+       depends on PPC_PSERIES
+       help
+         This devices exposes a hardware mechanism for fast synchronization
+         of threads across a large system which avoids bouncing a cacheline
+         between several cores on a system
+
 source "drivers/char/ipmi/Kconfig"
 
 config DS1620