diff -urp linux-2.6.22/arch/ppc/kernel/setup.c linux-2.6.22.patched/arch/ppc/kernel/setup.c
--- linux-2.6.22/arch/ppc/kernel/setup.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.patched/arch/ppc/kernel/setup.c	2007-10-22 06:52:01.000000000 +0200
@@ -85,7 +85,7 @@ int ppc_do_canonicalize_irqs;
 EXPORT_SYMBOL(ppc_do_canonicalize_irqs);
 #endif
 
-#ifdef CONFIG_VGA_CONSOLE
+#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB_VGA16)
 unsigned long vgacon_remap_base;
 #endif
 
diff -urp linux-2.6.22/arch/ppc/platforms/prep_setup.c linux-2.6.22.patched/arch/ppc/platforms/prep_setup.c
--- linux-2.6.22/arch/ppc/platforms/prep_setup.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.patched/arch/ppc/platforms/prep_setup.c	2007-10-22 06:52:40.000000000 +0200
@@ -916,9 +916,11 @@ prep_setup_arch(void)
 		break;
 	}
 
-#ifdef CONFIG_VGA_CONSOLE
+#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_FB_VGA16)
 	/* vgacon.c needs to know where we mapped IO memory in io_block_mapping() */
 	vgacon_remap_base = 0xf0000000;
+#endif
+#if defined(CONFIG_VGA_CONSOLE)
 	conswitchp = &vga_con;
 #endif
 }
diff -urp linux-2.6.22/drivers/char/Kconfig linux-2.6.22.patched/drivers/char/Kconfig
--- linux-2.6.22/drivers/char/Kconfig	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.patched/drivers/char/Kconfig	2007-10-22 07:40:23.000000000 +0200
@@ -741,7 +741,7 @@ source "drivers/char/hw_random/Kconfig"
 
 config NVRAM
 	tristate "/dev/nvram support"
-	depends on ATARI || X86 || ARM || GENERIC_NVRAM
+	depends on ATARI || X86 || ARM || PPC || POWERPC || GENERIC_NVRAM
 	---help---
 	  If you say Y here and create a character special file /dev/nvram
 	  with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -767,7 +767,7 @@ config NVRAM
 
 config RTC
 	tristate "Enhanced Real Time Clock Support"
-	depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390
+	depends on !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390
 	---help---
 	  If you say Y here and create a character special file /dev/rtc with
 	  major number 10 and minor number 135 using mknod ("man mknod"), you
diff -urp linux-2.6.22/drivers/rtc/Kconfig linux-2.6.22.patched/drivers/rtc/Kconfig
--- linux-2.6.22/drivers/rtc/Kconfig	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.patched/drivers/rtc/Kconfig	2007-10-22 07:32:37.000000000 +0200
@@ -246,7 +246,7 @@ comment "Platform RTC drivers"
 config RTC_DRV_CMOS
 	tristate "PC-style 'CMOS'"
 	depends on RTC_CLASS && (X86 || ALPHA || ARM26 || ARM \
-		|| M32R || ATARI || POWERPC || MIPS)
+		|| M32R || ATARI || PPC || POWERPC || MIPS)
 	help
 	  Say "yes" here to get direct support for the real time clock
 	  found in every PC or ACPI-based system, and some other boards.

