From: Zygo Blaxell <zblaxell@serenity.furryterror.org>
Date: Sat, 29 Nov 2014 06:09:33 +0000 (-0500)
Subject: zygo: make oldconfig for zygo-3.12.33-zb64
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b294dc824df7b218d96868e4d87e4712ce178d9d;p=linux

zygo: make oldconfig for zygo-3.12.33-zb64
---

diff --git a/.config b/.config
index e0f802cd9a45..8fdd3438e248 100644
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.27 Kernel Configuration
+# Linux/x86 3.12.33 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -520,7 +520,7 @@ CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
+CONFIG_RELOCATABLE=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
@@ -4250,6 +4250,7 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)