diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/if_plip.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/if_plip.h')
| -rw-r--r-- | include/linux/if_plip.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/if_plip.h b/include/linux/if_plip.h index 153a649915a2..6298c7e88b2b 100644 --- a/include/linux/if_plip.h +++ b/include/linux/if_plip.h | |||
| @@ -15,8 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #define SIOCDEVPLIP SIOCDEVPRIVATE | 16 | #define SIOCDEVPLIP SIOCDEVPRIVATE |
| 17 | 17 | ||
| 18 | struct plipconf | 18 | struct plipconf { |
| 19 | { | ||
| 20 | unsigned short pcmd; | 19 | unsigned short pcmd; |
| 21 | unsigned long nibble; | 20 | unsigned long nibble; |
| 22 | unsigned long trigger; | 21 | unsigned long trigger; |