On Thu, Apr 15, 2010 at 05:38:14PM -0400, Luis R. Rodriguez wrote: > The PHY split is easier done in a few steps. First move > the RF ops to the private ops and rename them accordingly. > We split PHY stuff up first for the AR5008 and AR9002 > families. There are some callbacks that AR9002 share > with the AR5008 familiy so we set those first, if AR9002 > has some different callbacks it will override them upon > hardware init. > > Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx> > Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> > --- > drivers/net/wireless/ath/ath9k/Makefile | 3 +- > drivers/net/wireless/ath/ath9k/ani.c | 1 + > .../net/wireless/ath/ath9k/{phy.c => ar5008_phy.c} | 884 ++++++++++---------- In general, it is better to do renames in a separate patch -- the fixups are easier in cases where something else hit that file before your patch is applied. It might also help if you based big patches (or big series) on wireless-next-2.6 instead of wireless-testing, as I need to apply them to wireless-next-2.6 before I can send them to Dave. In this case, a patch that wireless-testing picked-up from linux-2.6 and which isn't in wireless-next-2.6 (and probably not net-next-2.6 either) causes this patch to fail to apply to wirless-next-2.6. I'll fix it up, in the interest of putting this series behind us... John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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