#include <asm/dma.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
 
 #define IrSR_RXPL_NEG_IS_ZERO (1<<4)
 #define IrSR_RXPL_POS_IS_ZERO 0x0
                        /* set board transceiver to SIR mode */
                        si->pdata->transceiver_mode(si->dev, IR_SIRMODE);
 
-                       /* configure GPIO46/47 */
-                       pxa_gpio_mode(GPIO46_STRXD_MD);
-                       pxa_gpio_mode(GPIO47_STTXD_MD);
-
                        /* enable the STUART clock */
                        pxa_irda_enable_sirclk(si);
                }
                /* set board transceiver to FIR mode */
                si->pdata->transceiver_mode(si->dev, IR_FIRMODE);
 
-               /* configure GPIO46/47 */
-               pxa_gpio_mode(GPIO46_ICPRXD_MD);
-               pxa_gpio_mode(GPIO47_ICPTXD_MD);
-
                /* enable the FICP clock */
                pxa_irda_enable_firclk(si);