projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
m8260_pci.h
diff --git
a/arch/powerpc/include/asm/m8260_pci.h
b/arch/powerpc/include/asm/m8260_pci.h
index 45f01de820c7fb50f628b5b7bef2c0daec2a2726..6daca4f99b37aa85834bccf30e602e91ef6d6873 100644
(file)
--- a/
arch/powerpc/include/asm/m8260_pci.h
+++ b/
arch/powerpc/include/asm/m8260_pci.h
@@
-1,4
+1,3
@@
-
#ifndef _PPC_KERNEL_M8260_PCI_H
#define _PPC_KERNEL_M8260_PCI_H
#ifndef _PPC_KERNEL_M8260_PCI_H
#define _PPC_KERNEL_M8260_PCI_H