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 tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
include
/
mach
/
setup.h
diff --git
a/arch/arm/mach-ux500/include/mach/setup.h
b/arch/arm/mach-ux500/include/mach/setup.h
index
74b43bb
..
3dc00ff
100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/setup.h
+++ b/
arch/arm/mach-ux500/include/mach/setup.h
@@
-29,9
+29,6
@@
extern void __init db5500_dma_init(struct device *parent);
extern struct device *ux500_soc_device_init(const char *soc_id);
-/* We re-use nomadik_timer for this platform */
-extern void nmdk_timer_init(void);
-
struct amba_device;
extern void __init amba_add_devices(struct amba_device *devs[], int num);