From 7b58c271f5468bc08a980cdac3a14ede0f98fd2f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 23 Oct 2010 19:48:00 +0200
Subject: [PATCH] projects/ATV_nouveau: rename back to 'ATV'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../{ATV_nouveau => ATV}/linux/linux.i386.conf  | 17 +++++++++--------
 projects/{ATV_nouveau => ATV}/options           |  3 ---
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename projects/{ATV_nouveau => ATV}/linux/linux.i386.conf (99%)
 rename projects/{ATV_nouveau => ATV}/options (98%)

diff --git a/projects/ATV_nouveau/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
similarity index 99%
rename from projects/ATV_nouveau/linux/linux.i386.conf
rename to projects/ATV/linux/linux.i386.conf
index 5300e72c52..a23cbb3089 100644
--- a/projects/ATV_nouveau/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -123,7 +123,8 @@ CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 # CONFIG_BUG is not set
@@ -322,17 +323,17 @@ CONFIG_VMSPLIT_3G_OPT=y
 CONFIG_PAGE_OFFSET=0xB0000000
 # CONFIG_X86_PAE is not set
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_NEED_NODE_MEMMAP_SIZE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -653,7 +654,7 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=8
+CONFIG_BLK_DEV_RAM_COUNT=4
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
@@ -795,7 +796,7 @@ CONFIG_ATA_PIIX=y
 # Generic fallback / legacy drivers
 #
 CONFIG_PATA_ACPI=y
-CONFIG_ATA_GENERIC=y
+# CONFIG_ATA_GENERIC is not set
 # CONFIG_PATA_LEGACY is not set
 # CONFIG_MD is not set
 # CONFIG_FUSION is not set
diff --git a/projects/ATV_nouveau/options b/projects/ATV/options
similarity index 98%
rename from projects/ATV_nouveau/options
rename to projects/ATV/options
index d55b63408b..b104f023c0 100644
--- a/projects/ATV_nouveau/options
+++ b/projects/ATV/options
@@ -86,9 +86,6 @@
 # e.g. ADDITIONAL_DRIVERS="rtl8192se"
   ADDITIONAL_DRIVERS=""
 
-# build with compressed swap (zram) support (yes / no)
-  ZRAM_SUPPORT="yes"
-
 # build with network support (yes / no)
   NETWORK="yes"