Commit ad233aca authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb patchlet from Konrad Rzeszutek Wilk:
 "One trivial patch.

  Another patch (from Fengguang) is already in your tree courtesy of
  Andrew Morton - but I would prefer not to rebase my tree.  Hence the
  diff is very small"

* 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Make linux/swiotlb.h standalone includible
  MAINTAINERS: add git URL for swiotlb
parents 29737370 38674442
#ifndef __LINUX_SWIOTLB_H #ifndef __LINUX_SWIOTLB_H
#define __LINUX_SWIOTLB_H #define __LINUX_SWIOTLB_H
#include <linux/dma-direction.h>
#include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
struct device; struct device;
struct dma_attrs; struct dma_attrs;
struct page;
struct scatterlist; struct scatterlist;
extern int swiotlb_force; extern int swiotlb_force;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment