diff --git a/[refs] b/[refs] index 9c4f7c16c0e5..01432fdb539e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3467db1078e1f6784291496b93335a94f0e1392f +refs/heads/master: e9ef456ebc5b3e5a4794b57ad0403f1d9389ed53 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index cabe5e61af8e..e2a254aa6d08 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -170,7 +170,7 @@ static void slic_mcast_set_list(struct net_device *dev); static uint slic_first_init = 1; static char *slic_banner = "Alacritech SLIC Technology(tm) Server "\ - "and Storage Accelerator (Non-Accelerated)\n"; + "and Storage Accelerator (Non-Accelerated)"; static char *slic_proc_version = "2.0.351 2006/07/14 12:26:00"; static char *slic_product_name = "SLIC Technology(tm) Server "\ @@ -393,8 +393,8 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev, return err; if (slic_debug > 0 && did_version++ == 0) { - printk(slic_banner); - printk(slic_proc_version); + printk(KERN_DEBUG "%s\n", slic_banner); + printk(KERN_DEBUG "%s\n", slic_proc_version); } err = pci_set_dma_mask(pcidev, DMA_64BIT_MASK);