From 9d55dbd8cf5bd05f7248e53574f668d6c05e7c1d Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Tue, 2 Aug 2011 20:17:49 +0100 Subject: [PATCH] --- yaml --- r: 267375 b: refs/heads/master c: 3e8543618757ef2cb31a677a131027261a9b7251 h: refs/heads/master i: 267373: 3c01791c4ee7f8cae4d0a0094dab08d7d185590d 267371: 8219ab0085dd9c78bc7ce55a74ab184a9e4d8114 267367: 98cb4bdbab110aba7000900d807c923bd6641ef7 267359: d37ab36c8de02cf592ce067373871f6ea2edf4aa v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_netdev.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d4ec33e74cf4..526b2f3dd31a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a342657982209a8982981f8d38366adac2b9f15 +refs/heads/master: 3e8543618757ef2cb31a677a131027261a9b7251 diff --git a/trunk/drivers/staging/et131x/et131x_netdev.c b/trunk/drivers/staging/et131x/et131x_netdev.c index 546acb35b018..6eef4be69e26 100644 --- a/trunk/drivers/staging/et131x/et131x_netdev.c +++ b/trunk/drivers/staging/et131x/et131x_netdev.c @@ -671,8 +671,7 @@ struct net_device *et131x_device_alloc(void) /* Setup the function registration table (and other data) for a * net_device */ - /* netdev->init = &et131x_init; */ - /* netdev->set_config = &et131x_config; */ + netdev->watchdog_timeo = ET131X_TX_TIMEOUT; netdev->netdev_ops = &et131x_netdev_ops;