diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 01:51:07 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-11-29 01:51:07 -0800 |
| commit | 0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch) | |
| tree | d2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | |
| parent | Input: elantech - add resolution query support for v4 hardware (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | linux-dev-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz linux-dev-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.zip | |
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c index 9e728b3415e3..7faeadad1fff 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c @@ -48,8 +48,8 @@ } \ len += snprintf(page+len, PAGE_SIZE - len, "%d\n", var[i]) -int ft1000ReadProc(char *page, char **start, off_t off, - int count, int *eof, void *data) +static int ft1000ReadProc(char *page, char **start, off_t off, + int count, int *eof, void *data) { struct net_device *dev; int len; |