diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-12 09:24:46 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-12 09:24:46 +0300 |
commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/input/touchscreen/sun4i-ts.c | |
parent | 6bd744b723d229ac38eeea2cf0717d8cd2858032 (diff) | |
parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
download | linux-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/input/touchscreen/sun4i-ts.c')
-rw-r--r-- | drivers/input/touchscreen/sun4i-ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c index 4e83e96bb73f..0af0fe8c40d7 100644 --- a/drivers/input/touchscreen/sun4i-ts.c +++ b/drivers/input/touchscreen/sun4i-ts.c @@ -22,7 +22,7 @@ * in the kernel). So this driver offers straight forward, reliable single * touch functionality only. * - * s.a. A20 User Manual "1.15 TP" (Documentation/arm/sunxi/README) + * s.a. A20 User Manual "1.15 TP" (Documentation/arm/sunxi.rst) * (looks like the description in the A20 User Manual v1.3 is better * than the one in the A10 User Manual v.1.5) */ |