Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...
Jeff Garzik [Thu, 7 Aug 2008 08:05:46 +0000 (04:05 -0400)]
1  2 
drivers/char/pcmcia/synclink_cs.c
drivers/char/synclink.c
drivers/char/synclink_gt.c
drivers/char/synclinkmp.c
drivers/net/wan/Kconfig
drivers/net/wan/cosa.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -397,12 -387,12 +387,12 @@@ static int __init cosa_init(void
                err = PTR_ERR(cosa_class);
                goto out_chrdev;
        }
 -      for (i=0; i<nr_cards; i++) {
 -              device_create(cosa_class, NULL, MKDEV(cosa_major, i), "cosa%d", i);
 -      }
 +      for (i = 0; i < nr_cards; i++)
 +              device_create_drvdata(cosa_class, NULL, MKDEV(cosa_major, i),
 +                                    NULL, "cosa%d", i);
        err = 0;
        goto out;
-       
  out_chrdev:
        unregister_chrdev(cosa_major, "cosa");
  out: