diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 02:44:11 -0400 |
| commit | cd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d (patch) | |
| tree | 9424d3ac86e753706cc6c3d7e6072d2a73711e29 /drivers/isdn | |
| parent | 11b91d6fe7272452c999573bab33c15c2f03dc31 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
Merge tag 'v3.3-rc7' into x86/mce
Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 2339d7396b9e..802ab87a78b6 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
| @@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev, | |||
| 1901 | { | 1901 | { |
| 1902 | isdn_net_local *lp = netdev_priv(dev); | 1902 | isdn_net_local *lp = netdev_priv(dev); |
| 1903 | unsigned char *p; | 1903 | unsigned char *p; |
| 1904 | ushort len = 0; | 1904 | int len = 0; |
| 1905 | 1905 | ||
| 1906 | switch (lp->p_encap) { | 1906 | switch (lp->p_encap) { |
| 1907 | case ISDN_NET_ENCAP_ETHER: | 1907 | case ISDN_NET_ENCAP_ETHER: |