diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:31 +0200 |
| commit | 6021818e3d7933da580f83972cb0d8556df6659c (patch) | |
| tree | 676f87b0549e6d6776209234b73e700f5dd2cbc1 /arch/arm/include/asm/barebox-arm.h | |
| parent | 2385424e3034e7d309d39658938ee61cf9897ddf (diff) | |
| parent | fd5cd6084afc0595f76f0e6caab4589a9bdeb5a5 (diff) | |
| download | barebox-6021818e3d7933da580f83972cb0d8556df6659c.tar.gz barebox-6021818e3d7933da580f83972cb0d8556df6659c.tar.xz | |
Merge branch 'for-next/arm-remove-arch-init-ll'
Conflicts:
arch/arm/include/asm/barebox-arm.h
Diffstat (limited to 'arch/arm/include/asm/barebox-arm.h')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 8862f367c2..9e17b4f5fb 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -36,7 +36,6 @@ extern char __exceptions_start[], __exceptions_stop[]; void board_init_lowlevel(void); void board_init_lowlevel_return(void); -void arch_init_lowlevel(void); uint32_t get_runtime_offset(void); #endif /* _BAREBOX_ARM_H_ */ |