diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/linux/if_plip.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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; |