Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / arch / arm / mach-picoxcell / Makefile

diff --git a/arch/arm/mach-picoxcell/Makefile b/arch/arm/mach-picoxcell/Makefile
index c550b6363488267ba7cbc0cc52f8ad036d1f061b..e5ec4a8d9bcb39e370a26742e237d3896dc0a20d 100644 (file)
--- a/arch/arm/mach-picoxcell/Makefile
+++ b/arch/arm/mach-picoxcell/Makefile
@@ -1,3 +1,2 @@
 obj-y  := common.o
 obj-y  += time.o
-obj-y  += io.o