From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 7 Aug 2008 08:05:46 +0000 (-0400)
Subject: Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux... 
X-Git-Tag: v2.6.27-rc3~69^2~13^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3859069bc3358772b08bd91efe9edec39a746ea8;p=linux-2.6-omap-h63xx.git

Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
---

3859069bc3358772b08bd91efe9edec39a746ea8
diff --cc drivers/net/wan/cosa.c
index f7d3349dc3e,e38b7acc52d..f14051556c8
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@@ -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: