[PATCH 0/3] STA2X11 fixes for next

[Alessandro Rubini]

My patch to add sta2x11 initial support has been merged by Ingo Molnar
as commit 60dda96f, with signed-off by Jesse Barnes.  However, it
depended on two config symbols (the patch was 3/3, actually) and
I'm to get the blame for not noting it when Jesse told me he would
merge the 3/3.

Additionally, commit aa04651 by Andrzej Pietrasiewicz changed some
prototypes we use, so stuff is not compiling any more if
CONFIG_STA2X11 is on.

I Cc: all involved parties in all patches.  The commit
messages for the original patches have been reworded to match the fact
that they are going in after sta2x11-fixup.c .  At this point, they
are all bugfix patches.

Alessandro Rubini (3):
  x86/PCI: change sta2x11-fixup to account for commit aa04651
  x86: introduce CONFIG_X86_DEV_DMA_OPS
  x86: introduce CONFIG_X86_DMA_REMAP

 arch/x86/Kconfig                   |   11 +++++++++++
 arch/x86/include/asm/device.h      |    4 ++--
 arch/x86/include/asm/dma-mapping.h |    9 ++++++++-
 arch/x86/pci/sta2x11-fixup.c       |   12 +++++++-----
 4 files changed, 28 insertions(+), 8 deletions(-)

-- 
1.7.7.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/