On Tue, 2009-09-01 at 15:00 +0800, Dmitry Torokhov wrote: > On Tue, Sep 01, 2009 at 02:53:02PM +0800, Zhang Rui wrote: > > On Tue, 2009-09-01 at 14:47 +0800, Zhang Rui wrote: > > > On Tue, 2009-09-01 at 14:28 +0800, Dmitry Torokhov wrote: > > > > On Mon, Aug 31, 2009 at 01:04:35PM -0400, Len Brown wrote: > > > > > I put this in the acpi test tree, with the expectation > > > > > that it will have at least one minor revision update > > > > > before going upstream. > > > > > > > > > > thanks, > > > > > Len Brown, Intel Open Source Technology Center > > > > > > > > > > > > > Breaks build here... > > > > > > > that's weird. > > > I didn't encounter this problem in my test. > > > > > PREFIX is defined in include/acpi/acpi_bus.h, > > which has already been included in this driver. > > > > I got this after applying your patch, > > CC drivers/acpi/als.o > > drivers/acpi/als.c:46:1: warning: "PREFIX" redefined > > In file included from drivers/acpi/als.c:30: > > include/acpi/acpi_bus.h:33:1: warning: this is the location of the > > previous definition > > > > [dtor@dtor-d630 work]$ grep -r PREFIX include/acpi/acpi_bus.h > [dtor@dtor-d630 work]$ > > This is acpi test branch merged with latest pull from Linus plus my > for-linus and next branches that don't touch ACPI code. > hah, right, this is caused by commit a192a9580bcc41692be1f36b77c3b681827f566a, which removes the "PREFIX" in include/acpi/acpi_bus.h commit a192a9580bcc41692be1f36b77c3b681827f566a Author: Len Brown <len.brown@xxxxxxxxx> Date: Tue Jul 28 16:45:54 2009 -0400 ACPI: Move definition of PREFIX from acpi_bus.h to internal..h Linux/ACPI core files using internal.h all PREFIX "ACPI: ", however, not all ACPI drivers use/want it -- and they should not have to #undef PREFIX to define their own. Add GPL commment to internal.h while we are there. This does not change any actual console output, asside from a whitespace fix. Signed-off-by: Len Brown <len.brown@xxxxxxxxx> thanks for finding and fixing this. thanks, rui -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html