On Fri, 11 Feb 2011 11:45:14 +1100, Stephen Rothwell wrote: > Hi Jean, > > After merging the i2c tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/video/cyber2000fb.c:51:26: error: linux/i2c-id.h: No such file or directory > > Caused by commit 06bc0fe05c62297e1db2979d591770459439866e ("i2c: Get rid > of <linux/i2c-id.h>") interacting with commit > 8749b1ad69f91be1f5735563c7f235f802c7ea7d ("VIDEO: cyberpro: add I2C > support") from the arm tree. > > I applied the following fix up patch for today. Russell, this could be > applied in the arm tree as there is nothing relevant in that header file > even in Linus' tree. Yes, the patch is correct and applying it to the arm tree is the right thing to do. > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Fri, 11 Feb 2011 11:41:35 +1100 > Subject: [PATCH] VIDEO: cyberpro: remove obsolate include > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > drivers/video/cyber2000fb.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c > index 44db875..8503807 100644 > --- a/drivers/video/cyber2000fb.c > +++ b/drivers/video/cyber2000fb.c > @@ -48,7 +48,6 @@ > #include <linux/init.h> > #include <linux/io.h> > #include <linux/i2c.h> > -#include <linux/i2c-id.h> > #include <linux/i2c-algo-bit.h> > > #include <asm/pgtable.h> Thanks, -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html