diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
| commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
| tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /lib/Kconfig | |
| parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 4b31a46fb307..75cdb77fa49d 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -42,6 +42,9 @@ config GENERIC_IO | |||
| 42 | config STMP_DEVICE | 42 | config STMP_DEVICE |
| 43 | bool | 43 | bool |
| 44 | 44 | ||
| 45 | config PERCPU_RWSEM | ||
| 46 | boolean | ||
| 47 | |||
| 45 | config CRC_CCITT | 48 | config CRC_CCITT |
| 46 | tristate "CRC-CCITT functions" | 49 | tristate "CRC-CCITT functions" |
| 47 | help | 50 | help |