diff --git a/Makefile b/Makefile
index 094fef8..7f243d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 22
-EXTRAVERSION = -taskit4
+EXTRAVERSION = -taskit4-r1
 NAME = Holy Dancing Manatees, Batman!
 
 # *DOCUMENTATION*
diff --git a/arch/arm/mach-at91/board-panelcard.c b/arch/arm/mach-at91/board-panelcard.c
index c113021..2ff104a 100644
--- a/arch/arm/mach-at91/board-panelcard.c
+++ b/arch/arm/mach-at91/board-panelcard.c
@@ -386,7 +386,7 @@ static struct atmel_lcdfb_info __initdata panelcard_lcdc_data = {
 	.guard_time			= 1,
 };
 
-static struct panelcard_bl_data panelcard_bl_data;
+static struct panelcard_bl_data panelcard_bl_data = {};
 #endif
 
 static struct platform_device panelcard_bl_device = {
@@ -400,10 +400,6 @@ static struct platform_device panelcard_bl_device = {
 static void __init panelcard_register_backlight(void) {
 	platform_device_register(&panelcard_bl_device);
 }
-
-#else
-static struct atmel_lcdfb_info __initdata panelcard_lcdc_data;
-static void __init panelcard_register_backlight(void) {}
 #endif
 
 #define PANELCARD_FLASH_BASE	AT91_CHIPSELECT_0
@@ -734,7 +730,11 @@ static void __init panelcard_add_device_buttons(void) {}
 
 #ifdef CONFIG_W1_MASTER_AT91GPIO
 static struct at91_gpio_w1_data panelcard_w1_data = {
+#if defined(CONFIG_PANELCARD_SHARP) || defined(CONFIG_PANELCARD_EDT35)
 	.pin = AT91_PIN_PA3,
+#else
+	.pin = AT91_PIN_PA23,
+#endif
 };
 
 static struct platform_device panelcard_w1_device = {
@@ -775,8 +775,10 @@ static void __init panelcard_board_init(void)
 	/* MMC */
 	at91_add_device_mmc(0, &panelcard_mmc_data);
 	/* LCD Controller */
+#if !defined(CONFIG_PANELCARD_NODISPLAY)
 	at91_add_device_lcdc(&panelcard_lcdc_data);
 	panelcard_register_backlight();
+#endif
 	/* NOR Flash */
 	platform_device_register(&panelcard_flash);
 	/* RTC */