Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / blackfin / include / asm / portmux.h

diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h
index 300ef44fd154ce0bb6e8944e4c6b09385469528d..003694b515a0e17854a98aff0f31f102ca964717 100644 (file)
--- a/arch/blackfin/include/asm/portmux.h
+++ b/arch/blackfin/include/asm/portmux.h
@@ -17,11 +17,6 @@
 #define P_MAYSHARE     0x2000
 #define P_DONTCARE     0x1000
 
-#ifndef CONFIG_BFIN_GPIO_TRACK
-#define peripheral_request(per, label) peripheral_request(per)
-#define peripheral_request_list(per, label) peripheral_request_list(per)
-#endif
-
 #ifndef __ASSEMBLY__
 
 int peripheral_request(unsigned short per, const char *label);