r1809

dslinux_amadeus at dslinux.in-berlin.de dslinux_amadeus at dslinux.in-berlin.de
Mon Jun 25 23:51:51 CEST 2007


Author: amadeus
Date: 2007-06-25 23:51:46 +0200 (Mon, 25 Jun 2007)
New Revision: 1809

Log:
Fix compile error without CONFIG_NDS_ROM8BIT.

Modified: trunk/linux-2.6.x/drivers/block/dldi_s.S
===================================================================
--- trunk/linux-2.6.x/drivers/block/dldi_s.S	2007-06-24 13:02:21 UTC (rev 1808)
+++ trunk/linux-2.6.x/drivers/block/dldi_s.S	2007-06-25 21:51:46 UTC (rev 1809)
@@ -1,3 +1,5 @@
+/* Config Options */
+#include <linux/config.h>
 
 /* common macros for all NDS GBA ROM device drivers */
 #include <asm/arch/gbarom-macro.S>
@@ -10,8 +12,10 @@
 	.global	_call_dldi
 	.global _buf_dldi
 
+#ifdef CONFIG_NDS_ROM8BIT
 	.global gba_set_io
 	.global gba_set_ram
+#endif
 
 @---------------------------------------------------------------------------------
 .equ FEATURE_MEDIUM_CANREAD,		0x00000001
@@ -88,6 +92,7 @@
 
 	.align
 _call_dldi:
+#ifdef CONFIG_NDS_ROM8BIT
 @ test the data cache control if we have RAM at GBA ROM space
 	mrc	p15, 0, r0, c2, c0, 0
 	tst	r0,#0b10000000		@ (this must be synchronous to head.S)
@@ -152,6 +157,7 @@
 	bx	lr			@ return
 @ direct call without bankswitching.
 _call_dldi_direct:
+#endif
 	ldr	ip,=_param_dldi		@ ip = IO parameter block
 	ldr	r0,[ip,#8]		@ read parameter 1
 	ldr	r1,[ip,#12]		@ read parameter 2




More information about the dslinux-commit mailing list