diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/net/wan/lapbether.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/wan/lapbether.c')
-rw-r--r-- | drivers/net/wan/lapbether.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index a817081737a0..7beeb9b88a3b 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
@@ -259,14 +259,13 @@ static int lapbeth_set_mac_address(struct net_device *dev, void *addr) | |||
259 | } | 259 | } |
260 | 260 | ||
261 | 261 | ||
262 | static struct lapb_register_struct lapbeth_callbacks = { | 262 | static const struct lapb_register_struct lapbeth_callbacks = { |
263 | .connect_confirmation = lapbeth_connected, | 263 | .connect_confirmation = lapbeth_connected, |
264 | .connect_indication = lapbeth_connected, | 264 | .connect_indication = lapbeth_connected, |
265 | .disconnect_confirmation = lapbeth_disconnected, | 265 | .disconnect_confirmation = lapbeth_disconnected, |
266 | .disconnect_indication = lapbeth_disconnected, | 266 | .disconnect_indication = lapbeth_disconnected, |
267 | .data_indication = lapbeth_data_indication, | 267 | .data_indication = lapbeth_data_indication, |
268 | .data_transmit = lapbeth_data_transmit, | 268 | .data_transmit = lapbeth_data_transmit, |
269 | |||
270 | }; | 269 | }; |
271 | 270 | ||
272 | /* | 271 | /* |