On Wed, Jul 30, 2008 at 10:46 PM, <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > From: Harvey Harrison <harvey.harrison@xxxxxxxxx> > > __FUNCTION__ is gcc-specific, use __func__ > > Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> > Cc: "John W. Linville" <linville@xxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> This patch conflicts (doing the same) with the patch I've posted chronologically before http://marc.info/?l=linux-wireless&m=121659723529274&w=2 Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html