Merge remote-tracking branch 'percpu/for-next'

[karo-tx-linux.git] / Documentation / misc-devices / apds990x.txt

diff --git a/Documentation/misc-devices/apds990x.txt b/Documentation/misc-devices/apds990x.txt
index d5408cade32f07a2742851c4a7142232b1a48da5..454d95d623b3f7204032f872b7445013f9ff4f9f 100644 (file)
--- a/Documentation/misc-devices/apds990x.txt
+++ b/Documentation/misc-devices/apds990x.txt
@@ -30,7 +30,7 @@ lead to false interrupt, but that doesn't harm.
 
 ALS contains 4 different gain steps. Driver automatically
 selects suitable gain step. After each measurement, reliability of the results
 
 ALS contains 4 different gain steps. Driver automatically
 selects suitable gain step. After each measurement, reliability of the results

-is estimated and new measurement is trigged if necessary.
+is estimated and new measurement is triggered if necessary.

 
 Platform data can provide tuned values to the conversion formulas if
 values are known. Otherwise plain sensor default values are used.
 
 Platform data can provide tuned values to the conversion formulas if
 values are known. Otherwise plain sensor default values are used.