diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:54:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-04-22 22:54:46 +0200 |
| commit | 3f81b2c49d31e763a9c1da831ceb6cef087cf6c6 (patch) | |
| tree | e261299ccded5d87db92850b8dfdadab8ae2c514 /lib/Kconfig | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
| parent | 6b866c151ad9ea44799b32c3a8c90a03c5b981da (diff) | |
Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into next/stmp-dev
Wolfram Sang <w.sang@pengutronix.de> writes:
This series makes support for a certain type of devices mach independant. We
want that because such devices (having a special register layout) have been
found in mach-mxs and mach-mx6 meanwhile.
Since there is no subsystem maintainer for lib/ and the use case is
currently only for ARM systems, I have agreed to merge these through
the arm-soc tree.
* 'stmp_device' of git://git.pengutronix.de/git/wsa/linux:
i2c: mxs: use global reset function
lib: add support for stmp-style devices
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 4a8aba2e5cc..c5da1548b96 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -33,6 +33,9 @@ config GENERIC_IO boolean default n +config STMP_DEVICE + bool + config CRC_CCITT tristate "CRC-CCITT functions" help |