diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 08:51:33 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 08:51:33 -0700 |
commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /drivers/staging/comedi/drivers/adl_pci8164.c | |
parent | Input: alps - non interleaved V2 dualpoint has separate stick button bits (diff) | |
parent | Input: atkbd - document "no new force-release quirks" policy (diff) | |
download | linux-dev-85a3685852d9ac7d92be9d824533c915a4597fa4.tar.xz linux-dev-85a3685852d9ac7d92be9d824533c915a4597fa4.zip |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci8164.c')
-rw-r--r-- | drivers/staging/comedi/drivers/adl_pci8164.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index 72bccb447a74..cc6c53b800a7 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c @@ -18,7 +18,7 @@ /* * Driver: adl_pci8164 * Description: Driver for the Adlink PCI-8164 4 Axes Motion Control board - * Devices: (ADLink) PCI-8164 [adl_pci8164] + * Devices: [ADLink] PCI-8164 (adl_pci8164) * Author: Michel Lachaine <mike@mikelachaine.ca> * Status: experimental * Updated: Mon, 14 Apr 2008 15:10:32 +0100 |