Revision 59cf4243e557aa64ab2ef51280454aa1f3828e14 authored by Jean Delvare on 25 May 2014, 15:23:08 UTC, committed by Jean Delvare on 25 May 2014, 15:23:08 UTC
In commit 9e8269de, support was added for ntc_thermistor devices being declared in the device tree and implemented on top of IIO. With that change, a dependency was added to the ntc_thermistor driver: depends on (!OF && !IIO) || (OF && IIO) This construct has the drawback that the driver can no longer be selected when OF is set and IIO isn't, nor when IIO is set and OF is not. This is a regression for the original users of the driver. As the new code depends on IIO and is useless without OF, include it only if both are enabled, and set the dependencies accordingly. This is clearer, more simple and more correct. Signed-off-by: Jean Delvare <jdelvare@suse.de> Fixes: 9e8269de hwmon: (ntc_thermistor) Add DT with IIO support to NTC thermistor driver Reviewed-by: Guenter Roeck <linux@roeck-us.net> Cc: Naveen Krishna Chatradhi <ch.naveen@samsung.com> Cc: Doug Anderson <dianders@chromium.org>
1 parent 0132514
| File | Mode | Size |
|---|---|---|
| asymmetric_keys | ||
| async_tx | ||
| 842.c | -rw-r--r-- | 4.6 KB |
| Kconfig | -rw-r--r-- | 40.0 KB |
| Makefile | -rw-r--r-- | 3.8 KB |
| ablk_helper.c | -rw-r--r-- | 4.2 KB |
| ablkcipher.c | -rw-r--r-- | 17.8 KB |
| aead.c | -rw-r--r-- | 14.0 KB |
| aes_generic.c | -rw-r--r-- | 61.9 KB |
| af_alg.c | -rw-r--r-- | 9.3 KB |
| ahash.c | -rw-r--r-- | 13.9 KB |
| algapi.c | -rw-r--r-- | 19.8 KB |
| algboss.c | -rw-r--r-- | 6.4 KB |
| algif_hash.c | -rw-r--r-- | 6.8 KB |
| algif_skcipher.c | -rw-r--r-- | 13.3 KB |
| ansi_cprng.c | -rw-r--r-- | 10.8 KB |
| anubis.c | -rw-r--r-- | 27.8 KB |
| api.c | -rw-r--r-- | 13.4 KB |
| arc4.c | -rw-r--r-- | 3.4 KB |
| authenc.c | -rw-r--r-- | 20.0 KB |
| authencesn.c | -rw-r--r-- | 23.1 KB |
| blkcipher.c | -rw-r--r-- | 19.9 KB |
| blowfish_common.c | -rw-r--r-- | 15.7 KB |
| blowfish_generic.c | -rw-r--r-- | 3.4 KB |
| camellia_generic.c | -rw-r--r-- | 34.9 KB |
| cast5_generic.c | -rw-r--r-- | 20.8 KB |
| cast6_generic.c | -rw-r--r-- | 9.5 KB |
| cast_common.c | -rw-r--r-- | 13.1 KB |
| cbc.c | -rw-r--r-- | 7.4 KB |
| ccm.c | -rw-r--r-- | 21.4 KB |
| chainiv.c | -rw-r--r-- | 8.5 KB |
| cipher.c | -rw-r--r-- | 3.3 KB |
| cmac.c | -rw-r--r-- | 7.5 KB |
| compress.c | -rw-r--r-- | 1.3 KB |
| crc32.c | -rw-r--r-- | 3.7 KB |
| crc32c_generic.c | -rw-r--r-- | 4.3 KB |
| crct10dif_common.c | -rw-r--r-- | 3.6 KB |
| crct10dif_generic.c | -rw-r--r-- | 3.2 KB |
| cryptd.c | -rw-r--r-- | 24.9 KB |
| crypto_null.c | -rw-r--r-- | 4.3 KB |
| crypto_user.c | -rw-r--r-- | 12.3 KB |
| crypto_wq.c | -rw-r--r-- | 972 bytes |
| ctr.c | -rw-r--r-- | 12.3 KB |
| cts.c | -rw-r--r-- | 9.8 KB |
| deflate.c | -rw-r--r-- | 5.4 KB |
| des_generic.c | -rw-r--r-- | 35.3 KB |
| ecb.c | -rw-r--r-- | 4.9 KB |
| eseqiv.c | -rw-r--r-- | 6.5 KB |
| fcrypt.c | -rw-r--r-- | 18.0 KB |
| fips.c | -rw-r--r-- | 705 bytes |
| gcm.c | -rw-r--r-- | 36.6 KB |
| gf128mul.c | -rw-r--r-- | 13.2 KB |
| ghash-generic.c | -rw-r--r-- | 3.7 KB |
| hash_info.c | -rw-r--r-- | 1.8 KB |
| hmac.c | -rw-r--r-- | 6.9 KB |
| internal.h | -rw-r--r-- | 4.1 KB |
| khazad.c | -rw-r--r-- | 51.8 KB |
| krng.c | -rw-r--r-- | 1.4 KB |
| lrw.c | -rw-r--r-- | 9.2 KB |
| lz4.c | -rw-r--r-- | 2.5 KB |
| lz4hc.c | -rw-r--r-- | 2.5 KB |
| lzo.c | -rw-r--r-- | 2.4 KB |
| md4.c | -rw-r--r-- | 6.2 KB |
| md5.c | -rw-r--r-- | 3.9 KB |
| memneq.c | -rw-r--r-- | 6.1 KB |
| michael_mic.c | -rw-r--r-- | 3.6 KB |
| pcbc.c | -rw-r--r-- | 7.7 KB |
| pcompress.c | -rw-r--r-- | 3.0 KB |
| pcrypt.c | -rw-r--r-- | 14.7 KB |
| proc.c | -rw-r--r-- | 3.7 KB |
| ripemd.h | -rw-r--r-- | 974 bytes |
| rmd128.c | -rw-r--r-- | 10.2 KB |
| rmd160.c | -rw-r--r-- | 12.6 KB |
| rmd256.c | -rw-r--r-- | 10.5 KB |
| rmd320.c | -rw-r--r-- | 13.1 KB |
| rng.c | -rw-r--r-- | 3.3 KB |
| salsa20_generic.c | -rw-r--r-- | 6.7 KB |
| scatterwalk.c | -rw-r--r-- | 3.3 KB |
| seed.c | -rw-r--r-- | 17.4 KB |
| seqiv.c | -rw-r--r-- | 8.5 KB |
| serpent_generic.c | -rw-r--r-- | 21.2 KB |
| sha1_generic.c | -rw-r--r-- | 3.5 KB |
| sha256_generic.c | -rw-r--r-- | 12.1 KB |
| sha512_generic.c | -rw-r--r-- | 8.7 KB |
| shash.c | -rw-r--r-- | 17.5 KB |
| tcrypt.c | -rw-r--r-- | 50.3 KB |
| tcrypt.h | -rw-r--r-- | 3.7 KB |
| tea.c | -rw-r--r-- | 6.6 KB |
| testmgr.c | -rw-r--r-- | 70.2 KB |
| testmgr.h | -rw-r--r-- | 971.0 KB |
| tgr192.c | -rw-r--r-- | 30.5 KB |
| twofish_common.c | -rw-r--r-- | 37.8 KB |
| twofish_generic.c | -rw-r--r-- | 6.2 KB |
| vmac.c | -rw-r--r-- | 18.9 KB |
| wp512.c | -rw-r--r-- | 59.7 KB |
| xcbc.c | -rw-r--r-- | 7.2 KB |
| xor.c | -rw-r--r-- | 4.0 KB |
| xts.c | -rw-r--r-- | 8.7 KB |
| zlib.c | -rw-r--r-- | 9.5 KB |
Computing file changes ...
