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/Makefile | |
| parent | Linux 3.4-rc3 (diff) | |
| parent | i2c: mxs: use global reset function (diff) | |
| download | linux-dev-3f81b2c49d31e763a9c1da831ceb6cef087cf6c6.tar.xz linux-dev-3f81b2c49d31e763a9c1da831ceb6cef087cf6c6.zip | |
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/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 18515f0267c4..f78dbcdc7e3d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -123,6 +123,8 @@ obj-$(CONFIG_SIGNATURE) += digsig.o obj-$(CONFIG_CLZ_TAB) += clz_tab.o +obj-$(CONFIG_STMP_DEVICE) += stmp_device.o + hostprogs-y := gen_crc32table clean-files := crc32table.h |