diff options
| author | Mark Brown | 2011-04-18 18:12:14 +0200 |
|---|---|---|
| committer | Mark Brown | 2011-04-18 18:12:14 +0200 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/input/serio/xilinx_ps2.c | |
| parent | ARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface (diff) | |
| parent | Linux 2.6.39-rc3 (diff) | |
| download | kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz kernel-qcow2-linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/input/serio/xilinx_ps2.c')
| -rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 7540bafc95cf..80baa53da5b1 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c @@ -225,7 +225,7 @@ static void sxps2_close(struct serio *pserio) /** * xps2_of_probe - probe method for the PS/2 device. * @of_dev: pointer to OF device structure - * @match: pointer to the stucture used for matching a device + * @match: pointer to the structure used for matching a device * * This function probes the PS/2 device in the device tree. * It initializes the driver data structure and the hardware. |