Merge branch 'linus' into sched/clock

1 files changed, 0 insertions, 23 deletions

diff --git a/include/asm-arm/arch-pxa/irda.h b/include/asm-arm/arch-pxa/irda.h
deleted file mode 100644
index 0a50c3c763df..000000000000
--- a/include/asm-arm/arch-pxa/irda.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef ASMARM_ARCH_IRDA_H
-#define ASMARM_ARCH_IRDA_H
-
-/* board specific transceiver capabilities */
-
-#define IR_OFF          1
-#define IR_SIRMODE      2
-#define IR_FIRMODE      4
-
-struct pxaficp_platform_data {
-        int transceiver_cap;
-        void (*transceiver_mode)(struct device *dev, int mode);
-        int (*startup)(struct device *dev);
-        void (*shutdown)(struct device *dev);
-};
-
-extern void pxa_set_ficp_info(struct pxaficp_platform_data *info);
-
-#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
-void pxa2xx_transceiver_mode(struct device *dev, int mode);
-#endif
-
-#endif