diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 21:50:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 21:50:04 +0200 |
| commit | 39b6cc668c5ecc66f6f9c9293ffab681cb6f7065 (patch) | |
| tree | f048b17a1b1a0a0f6d6a8d33459e8789c600c634 /lib/Makefile | |
| parent | Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | Merge branch 'stmp_device' of git://git.pengutronix.de/git/wsa/linux into nex... (diff) | |
| download | linux-39b6cc668c5ecc66f6f9c9293ffab681cb6f7065.tar.xz linux-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/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index b98df505f335..2a1d7f9d39a2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -127,6 +127,8 @@ obj-$(CONFIG_DDR) += jedec_ddr_data.o obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o +obj-$(CONFIG_STMP_DEVICE) += stmp_device.o + hostprogs-y := gen_crc32table clean-files := crc32table.h |