Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / wireless / wl1251 / io.h

diff --git a/drivers/net/wireless/wl12xx/wl1251_io.h b/drivers/net/wireless/wl1251/io.h
similarity index 100%
rename from drivers/net/wireless/wl12xx/wl1251_io.h
rename to drivers/net/wireless/wl1251/io.h