Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / avm_pci.c

diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 035d158779df75f328eca89c77a3e968497fb0ba..0f1db1f669b28028162fcf205bb69c5bd4749359 100644 (file)
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -263,11 +263,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count)
                outl(idx, cs->hw.avm.cfg_reg + 4);
                while (cnt < count) {
 #ifdef __powerpc__
-#ifdef CONFIG_APUS
-                       *ptr++ = in_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
-#else
                        *ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
-#endif /* CONFIG_APUS */
 #else
                        *ptr++ = inl(cs->hw.avm.isac);
 #endif /* __powerpc__ */
@@ -328,11 +324,7 @@ hdlc_fill_fifo(struct BCState *bcs)
        if (cs->subtyp == AVM_FRITZ_PCI) {
                while (cnt<count) {
 #ifdef __powerpc__
-#ifdef CONFIG_APUS
-                       out_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
-#else
                        out_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
-#endif /* CONFIG_APUS */
 #else
                        outl(*ptr++, cs->hw.avm.isac);
 #endif /* __powerpc__ */