Commit d6afb9ef authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] misc fixes

- add init_timer in bttv driver

- remove duplicated init_timer() in ncpfs.

- remove noisy printk's from 3c59x.c

- sparc64 compile fix with CONFIG_HUGETLBPAGE=y - htlbpage_max is now an
  int
parent 820ef9df
......@@ -1696,7 +1696,7 @@ static void __init taint_real_pages(void)
#ifdef CONFIG_HUGETLB_PAGE
long htlbpagemem = 0;
long htlbpage_max;
int htlbpage_max;
long htlbzone_pages;
extern struct list_head htlbpage_freelist;
#endif
......
......@@ -3225,6 +3225,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
INIT_LIST_HEAD(&btv->capture);
INIT_LIST_HEAD(&btv->vcapture);
init_timer(&btv->timeout);
btv->timeout.function = bttv_irq_timeout;
btv->timeout.data = (unsigned long)btv;
......
......@@ -1300,8 +1300,6 @@ static int __devinit vortex_probe1(struct pci_dev *pdev,
else
phyx = phy;
mii_status = mdio_read(dev, phyx, 1);
printk("phy=%d, phyx=%d, mii_status=0x%04x\n",
phy, phyx, mii_status);
if (mii_status && mii_status != 0xffff) {
vp->phys[phy_idx++] = phyx;
if (print_info) {
......
......@@ -572,7 +572,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
} else {
INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc, server);
INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc, server);
init_timer(&server->timeout_tm);
server->timeout_tm.data = (unsigned long)server;
server->timeout_tm.function = ncpdgram_timeout_call;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment