diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 07:22:40 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-10 07:22:40 +0100 |
| commit | 5d43889c07bb38694742936aa70d1187c012e198 (patch) | |
| tree | 73809dddae39ae3b746396e9779142dbd1973f33 /drivers/pci/proc.c | |
| parent | Input: ALPS - add support for DualPoint device on Dell XT2 model (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | linux-5d43889c07bb38694742936aa70d1187c012e198.tar.xz linux-5d43889c07bb38694742936aa70d1187c012e198.zip | |
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index cdc7836d7e3d..46d1378f2e9e 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -222,7 +222,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, default: ret = -EINVAL; break; - }; + } return ret; } |