From e4e4912712f658ab9a4c2dac2bfcb371632add72 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 9 Oct 2013 18:46:05 -0600
Subject: [PATCH] SAMA5 LCDC:  Fix a few compilation errors that show up when
 additional layers are enabled

---
 arch/arm/src/sama5/sam_lcd.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index e027b20966..ae30947402 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -2752,15 +2752,17 @@ static void sam_show_base(void)
  ****************************************************************************/
 
 #ifdef CONFIG_FB_HWCURSOR
-static void sam_show_hcr(uint32_t x, uint32_t y)
+static void sam_show_hcr(void)
 {
+  uint32_t regval;
+
   /* Enable default transparent keying */
 
   sam_putreg(SAM_LCDC_HCRCFG7, 0x00000000);
   sam_putreg(SAM_LCDC_HCRCFG8, 0xffffffff);
 
   regval  = sam_getreg(SAM_LCDC_HCRCFG9);
-  regval |= LCDC_HCRCFG9_CRKEY);
+  regval |= LCDC_HCRCFG9_CRKEY;
   sam_putreg(SAM_LCDC_HCRCFG9, regval);
 
   /* And show the hardware cursor layer */
@@ -2787,6 +2789,9 @@ static void sam_show_hcr(uint32_t x, uint32_t y)
 
 int up_fbinitialize(void)
 {
+#if defined(CONFIG_SAMA5_LCDC_OVR1) && defined(CONFIG_SAMA5_LCDC_HEO)
+  uint32_t regval;
+#endif
   int ret;
 
   gvdbg("Entry\n");