From: Paul M. <le...@li...> - 2007-09-12 02:20:06
|
On Tue, Sep 11, 2007 at 07:17:45PM -0700, Kristoffer Ericson wrote: > @@ -46,10 +46,24 @@ static struct platform_device cf_ide_device = { > .resource = cf_ide_resources, > }; > > +static struct platform_device jornadakbd_device = { > + .name = "jornada680_kbd", > + .id = -1, > +}; > + > static struct platform_device *hp6xx_devices[] __initdata = { > - &cf_ide_device, > + &cf_ide_device, > +#ifdef CONFIG_KEYBOARD_HP6XX > + &jornadakbd_device, > +#endif > }; > Don't ifdef these, they're all __initdata, if nothing claims the device, it will be freed up automatically. ifdefs just make this an ugly mess for very little gain. The rest looks fine, I'll queue it up. |