Merge branch 'master' of git://git.denx.de/u-boot-nds32

This commit is contained in:
Tom Rini 2013-07-25 08:22:08 -04:00
commit aaf5e82560
25 changed files with 384 additions and 43 deletions

View file

@ -11,11 +11,11 @@
#include <malloc.h>
#include <pci.h>
#include <faraday/ftpci100.h>
#include <asm/io.h>
#include <asm/types.h> /* u32, u16.... used by pci.h */
#include "pci_ftpci100.h"
struct ftpci100_data {
unsigned int reg_base;
unsigned int io_base;