summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-18 22:42:06 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-18 22:42:06 +0100
commit143c9054949436cb05e468439dc5e46231f33d09 (patch)
treec2e972d8188fb1b36368e9acb5b6b59466c9d903 /Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
parentnet: vmxnet3 calls skb_set_hash (diff)
parentMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-143c9054949436cb05e468439dc5e46231f33d09.tar.xz
linux-143c9054949436cb05e468439dc5e46231f33d09.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt')
-rw-r--r--Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
index 47ada1dff216..5d49f2b37f68 100644
--- a/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
@@ -49,7 +49,7 @@ adc@12D10000 {
/* NTC thermistor is a hwmon device */
ncp15wb473@0 {
compatible = "ntc,ncp15wb473";
- pullup-uV = <1800000>;
+ pullup-uv = <1800000>;
pullup-ohm = <47000>;
pulldown-ohm = <0>;
io-channels = <&adc 4>;