summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-09-19 15:20:36 -0500
committerScott Wood <scottwood@freescale.com>2014-09-19 15:20:42 -0500
commitcb0446c1b625326682ec4f9d1dd10779433646bc (patch)
tree9579440c40470de0686518ad274487fb5b41005c /arch/powerpc/include/asm
parent6db35ad2373eed5deb3b105ae7c1e9de3e34ae94 (diff)
downloadop-kernel-dev-cb0446c1b625326682ec4f9d1dd10779433646bc.zip
op-kernel-dev-cb0446c1b625326682ec4f9d1dd10779433646bc.tar.gz
Revert "powerpc/fsl_msi: spread msi ints across different MSIRs"
This reverts commit c822e73731fce3b49a4887140878d084d8a44c08. This commit conflicted with a bitmap allocator change that partially accomplishes the same thing, but which does so more correctly. Revert this one until it can be respun on top of the correct change. Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/msi_bitmap.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/msi_bitmap.h b/arch/powerpc/include/asm/msi_bitmap.h
index 96c2f95..97ac3f4 100644
--- a/arch/powerpc/include/asm/msi_bitmap.h
+++ b/arch/powerpc/include/asm/msi_bitmap.h
@@ -25,8 +25,6 @@ int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num);
void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,
unsigned int num);
void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq);
-int msi_bitmap_alloc_hwirqs_from_offset(struct msi_bitmap *bmp, int offset,
- int num);
int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp);
OpenPOWER on IntegriCloud