git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/iommu-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
include
/
mach
/
devices.h
diff --git
a/arch/arm/mach-mmp/include/mach/devices.h
b/arch/arm/mach-mmp/include/mach/devices.h
index
1fa0a49
..
d0ec7da
100644
(file)
--- a/
arch/arm/mach-mmp/include/mach/devices.h
+++ b/
arch/arm/mach-mmp/include/mach/devices.h
@@
-1,3
+1,6
@@
+#ifndef __MACH_DEVICE_H
+#define __MACH_DEVICE_H
+
#include <linux/types.h>
#define MAX_RESOURCE_DMA 2
@@
-47,3
+50,4
@@
struct pxa_device_desc mmp2_device_##_name __initdata = { \
}
extern int pxa_register_device(struct pxa_device_desc *, void *, size_t);
+#endif /* __MACH_DEVICE_H */