From: Paul M. <le...@li...> - 2007-08-19 23:20:57
|
On Sat, Aug 18, 2007 at 12:13:00AM +0200, Markus Brunner wrote: > The write size for the heartbeat module was adjusted with an ifdef That and the logic was inverted. I suppose this is going to be another candidate for real platform data. > The default config won't compile, but this is a general dsp problem since 2.6.23-rc1 > http://marc.info/?l=linuxsh-dev&m=118734760923296&w=2 > Should be fixed for -rc3. > --- sh-2.6-intc/arch/sh/boards/magicpanelr2/setup.c 1970-01-01 01:00:00.000000000 +0100 > +++ sh-2.6/arch/sh/boards/magicpanelr2/setup.c 2007-08-17 11:28:54.000000000 +0200 > +#include <linux/autoconf.h> This header is obsolete, use config.h if you really want it, but Kbuild includes it by default these days, so it's not particularly useful either way. > +#include <linux/init.h> > +#include <linux/irq.h> > +#include <linux/platform_device.h> > + > +#include <linux/hdreg.h> > +#include <linux/ide.h> > +#include <asm/magicpanelr2.h> > +#include <linux/irq.h> > +#include <linux/delay.h> > + linux/ headers before asm/ headers. > +#if CONFIG_SH_MAGIC_PANEL_R2_VERSION == 2 > + ctrl_outb(0x30, PORT_PMDR); > +#elif CONFIG_SH_MAGIC_PANEL_R2_VERSION == 3 > + ctrl_outb(0xF0, PORT_PMDR); > +#else > +#error Unknown revision of PLATFORM_MP_R2 > +#endif > + Do you not have a version register you can check instead? The differences between the versions look pretty mundane, and you can likely support all of them in a single config if you do some run-time checking. |