Merge branch '4.0-fixes' into mips-for-linux-next

This commit is contained in:
Ralf Baechle
2015-04-13 16:03:32 +02:00
35 changed files with 764 additions and 384 deletions

View File

@@ -11,9 +11,6 @@
#include <linux/pci.h>
/* Some PCI cards require delays when accessing config space. */
#define PCI_CONFIG_SPACE_DELAY 10000
/*
* The physical memory base mapped by BAR1. 256MB at the end of the
* first 4GB.