Simon > -----Original Message----- > From: Que, Simon > Sent: Friday, August 13, 2010 8:52 PM > To: Premi, Sanjeev; Linux Omap; Tony Lindgren > Cc: Cousson, Benoit; Shilimkar, Santosh; Kanigeri, Hari > Subject: RE: [PATCH 1/4 v2] omap: hwspinlock: uncomment the hwmod part for > hwspinlock > > > > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- > > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > > [sp] I did not see this file in any of the "master", > > "for-next" or "pm" branches. > > [SQ] This will go into Santosh's omap4_next branch for upstreaming. That > branch contains the file. > There is a slight change in the way OMAP4 hwmod database will be merged. Every driver need to add it's respective databse as part of the series. Please find more info on the below thread. http://www.spinics.net/lists/linux-omap/msg34700.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html