This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / wireless / atmel_cs.c

diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index b99c439..c3c561f 100644 (file)
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -350,10 +350,13 @@ static struct {
 /* This is strictly temporary, until PCMCIA devices get integrated into the device model. */
 static struct device *atmel_device(void)
 {
+       static char *kobj_name = "atmel_cs";
+
        static struct device dev = {
                .bus_id    = "pcmcia",
        };
-       kobject_set_name(&dev.kobj, "atmel_cs");
+       dev.kobj.k_name = kmalloc(strlen(kobj_name)+1, GFP_KERNEL);
+       strcpy(dev.kobj.k_name, kobj_name);
        kobject_init(&dev.kobj);
        
        return &dev;