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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
prom.h
diff --git
a/arch/arm/include/asm/prom.h
b/arch/arm/include/asm/prom.h
index
11b8708
..
6f65ca8
100644
(file)
--- a/
arch/arm/include/asm/prom.h
+++ b/
arch/arm/include/asm/prom.h
@@
-16,11
+16,6
@@
#include <asm/setup.h>
#include <asm/irq.h>
-static inline void irq_dispose_mapping(unsigned int virq)
-{
- return;
-}
-
extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
extern void arm_dt_memblock_reserve(void);