aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/mach-s3c64xx/Kconfig4
-rw-r--r--arch/arm/nwfpe/fpmodule.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0a2fc01891a9..76edcfe8b56f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1914,10 +1914,10 @@ choice
1914 default ZBOOT_ROM_NONE 1914 default ZBOOT_ROM_NONE
1915 help 1915 help
1916 Include experimental SD/MMC loading code in the ROM-able zImage. 1916 Include experimental SD/MMC loading code in the ROM-able zImage.
1917 With this enabled it is possible to write the the ROM-able zImage 1917 With this enabled it is possible to write the ROM-able zImage
1918 kernel image to an MMC or SD card and boot the kernel straight 1918 kernel image to an MMC or SD card and boot the kernel straight
1919 from the reset vector. At reset the processor Mask ROM will load 1919 from the reset vector. At reset the processor Mask ROM will load
1920 the first part of the the ROM-able zImage which in turn loads the 1920 the first part of the ROM-able zImage which in turn loads the
1921 rest the kernel image to RAM. 1921 rest the kernel image to RAM.
1922 1922
1923config ZBOOT_ROM_NONE 1923config ZBOOT_ROM_NONE
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 82c0915729ee..06ca1cd4cae2 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -210,7 +210,7 @@ config SMDK6410_WM1190_EV1
210 and audio daughtercard for the Samsung SMDK6410 reference 210 and audio daughtercard for the Samsung SMDK6410 reference
211 platform. Enabling this option will build support for this 211 platform. Enabling this option will build support for this
212 module into the kernel. The presence of the module will be 212 module into the kernel. The presence of the module will be
213 detected at runtime so the the resulting kernel can be used 213 detected at runtime so the resulting kernel can be used
214 with or without the 1190-EV1 fitted. 214 with or without the 1190-EV1 fitted.
215 215
216config SMDK6410_WM1192_EV1 216config SMDK6410_WM1192_EV1
@@ -226,7 +226,7 @@ config SMDK6410_WM1192_EV1
226 daughtercard for the Samsung SMDK6410 reference platform. 226 daughtercard for the Samsung SMDK6410 reference platform.
227 Enabling this option will build support for this module into 227 Enabling this option will build support for this module into
228 the kernel. The presence of the daughtercard will be 228 the kernel. The presence of the daughtercard will be
229 detected at runtime so the the resulting kernel can be used 229 detected at runtime so the resulting kernel can be used
230 with or without the 1192-EV1 fitted. 230 with or without the 1192-EV1 fitted.
231 231
232config MACH_NCP 232config MACH_NCP
diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c
index cb7658e8acc5..4e729f055a81 100644
--- a/arch/arm/nwfpe/fpmodule.c
+++ b/arch/arm/nwfpe/fpmodule.c
@@ -147,7 +147,7 @@ void float_raise(signed char flags)
147#ifdef CONFIG_DEBUG_USER 147#ifdef CONFIG_DEBUG_USER
148 if (flags & debug) 148 if (flags & debug)
149 printk(KERN_DEBUG 149 printk(KERN_DEBUG
150 "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n", 150 "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n",
151 current->comm, current->pid, flags, 151 current->comm, current->pid, flags,
152 __builtin_return_address(0), GET_USERREG()->ARM_pc); 152 __builtin_return_address(0), GET_USERREG()->ARM_pc);
153#endif 153#endif