summaryrefslogtreecommitdiffstats
path: root/lib/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-26 12:50:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-26 12:50:04 -0700
commit39b6cc668c5ecc66f6f9c9293ffab681cb6f7065 (patch)
treef048b17a1b1a0a0f6d6a8d33459e8789c600c634 /lib/Kconfig
parent27953437059c64d14086196eb96f43c78caa9db3 (diff)
parent3f81b2c49d31e763a9c1da831ceb6cef087cf6c6 (diff)
downloadlinux-stable-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.tar.gz
linux-stable-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.tar.bz2
linux-stable-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.zip
Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc stmp-dev library code from Olof Johansson: "A number of devices are using a common register layout, this adds support code for it in lib/stmp_device.c so we do not need to duplicate it in each driver." Fix up trivial conflicts in drivers/i2c/busses/i2c-mxs.c and lib/Makefile * tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: i2c: mxs: use global reset function lib: add support for stmp-style devices
Diffstat (limited to 'lib/Kconfig')
-rw-r--r--lib/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index 98230ac3db29..3e63af089082 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -36,6 +36,9 @@ config GENERIC_IO
boolean
default n
+config STMP_DEVICE
+ bool
+
config CRC_CCITT
tristate "CRC-CCITT functions"
help