Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / isdn / gigaset / common.c

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index aca165d43aa050952dbaaac63e34241cbfd10dd7..5800beeebb8589f0d5cac5d2cbd414c1fa8b359e 100644 (file)
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -616,7 +616,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
        } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
                skb_reserve(bcs->skb, HW_HDR_LEN);
        else {
-               dev_warn(cs->dev, "could not allocate skb\n");
+               warn("could not allocate skb\n");
                bcs->inputstate |= INS_skip_frame;
        }