From 4c3b7a5c0facd40a582ba77765f80a80df5eb38d Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Mon, 9 May 2011 16:33:03 +0200 Subject: [PATCH] --- yaml --- r: 249397 b: refs/heads/master c: 47d30257706a90926de396bc3055684d9215abd9 h: refs/heads/master i: 249395: 27effb4e30c25651ef50d0cb4ce94942b123ff0a v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/Makefile | 9 ++++----- .../staging/brcm80211/{util => brcmsmac}/bcmotp.c | 0 .../staging/brcm80211/{util => brcmsmac}/bcmsrom.c | 0 .../staging/brcm80211/{util => brcmsmac}/bcmsrom_tbl.h | 0 .../staging/brcm80211/{util => brcmsmac}/hnddma.c | 0 .../staging/brcm80211/{util => brcmsmac}/nicpci.c | 0 7 files changed, 5 insertions(+), 6 deletions(-) rename trunk/drivers/staging/brcm80211/{util => brcmsmac}/bcmotp.c (100%) rename trunk/drivers/staging/brcm80211/{util => brcmsmac}/bcmsrom.c (100%) rename trunk/drivers/staging/brcm80211/{util => brcmsmac}/bcmsrom_tbl.h (100%) rename trunk/drivers/staging/brcm80211/{util => brcmsmac}/hnddma.c (100%) rename trunk/drivers/staging/brcm80211/{util => brcmsmac}/nicpci.c (100%) diff --git a/[refs] b/[refs] index b1c6e4157da4..520f5c1bb378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fb137c581861ffcda5419fac4b80cb0372b1964 +refs/heads/master: 47d30257706a90926de396bc3055684d9215abd9 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile index 21797748100f..1cd3a1eada96 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile @@ -25,7 +25,6 @@ ccflags-y := \ -DBCMNVRAMR \ -Idrivers/staging/brcm80211/brcmsmac \ -Idrivers/staging/brcm80211/brcmsmac/phy \ - -Idrivers/staging/brcm80211/util \ -Idrivers/staging/brcm80211/include BRCMSMAC_OFILES := \ @@ -48,12 +47,12 @@ BRCMSMAC_OFILES := \ phy/wlc_phytbl_lcn.o \ phy/wlc_phytbl_n.o \ phy/wlc_phy_qmath.o \ + bcmotp.o \ + bcmsrom.o \ + hnddma.o \ + nicpci.o \ ../util/bcmutils.o \ ../util/bcmwifi.o \ - ../util/bcmotp.o \ - ../util/bcmsrom.o \ - ../util/hnddma.o \ - ../util/nicpci.o \ ../util/nvram/nvram_ro.o MODULEPFX := brcmsmac diff --git a/trunk/drivers/staging/brcm80211/util/bcmotp.c b/trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.c similarity index 100% rename from trunk/drivers/staging/brcm80211/util/bcmotp.c rename to trunk/drivers/staging/brcm80211/brcmsmac/bcmotp.c diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom.c b/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c similarity index 100% rename from trunk/drivers/staging/brcm80211/util/bcmsrom.c rename to trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom.c diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom_tbl.h b/trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h similarity index 100% rename from trunk/drivers/staging/brcm80211/util/bcmsrom_tbl.h rename to trunk/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h diff --git a/trunk/drivers/staging/brcm80211/util/hnddma.c b/trunk/drivers/staging/brcm80211/brcmsmac/hnddma.c similarity index 100% rename from trunk/drivers/staging/brcm80211/util/hnddma.c rename to trunk/drivers/staging/brcm80211/brcmsmac/hnddma.c diff --git a/trunk/drivers/staging/brcm80211/util/nicpci.c b/trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c similarity index 100% rename from trunk/drivers/staging/brcm80211/util/nicpci.c rename to trunk/drivers/staging/brcm80211/brcmsmac/nicpci.c