1 files changed, 78 insertions, 0 deletions
diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config
index 4b36464f..a2e646a1 100644
--- a/data/kernel.wanted.config
+++ b/data/kernel.wanted.config
@@ -92,6 +92,84 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXYNOS_VIDEO=y
+<<<<<<< HEAD
+#CONFIG_FB_3DFX_ACCEL=y
+#CONFIG_FB_3DFX_I2C=y
+#CONFIG_FB_3DFX=y
+#CONFIG_FB_ARC=y
+#CONFIG_FB_ARK=y
+#CONFIG_FB_ASILIANT=y
+#CONFIG_FB_ATY128_BACKLIGHT=y
+#CONFIG_FB_ATY128=y
+#CONFIG_FB_ATY_BACKLIGHT=y
+#CONFIG_FB_ATY_CT=y
+#CONFIG_FB_ATY_GX=y
+#CONFIG_FB_ATY=y
+#CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+#CONFIG_FB_BROADSHEET=y
+#CONFIG_FB_CARILLO_RANCH=y
+#CONFIG_FB_CARMINE_DRAM_EVAL=y
+#CONFIG_FB_CARMINE=y
+#CONFIG_FB_CIRRUS=y
+#CONFIG_FB_CYBER2000_DDC=y
+#CONFIG_FB_CYBER2000=y
+#CONFIG_FB_DDC=y
+#CONFIG_FB_DEFERRED_IO=y
+#CONFIG_FB_GEODE_GX1=y
+#CONFIG_FB_GEODE_GX=y
+#CONFIG_FB_GEODE_LX=y
+#CONFIG_FB_GEODE=y
+#CONFIG_FB_I740=y
+#CONFIG_FB_IMSTT=y
+#CONFIG_FB_KYRO=y
+#CONFIG_FB_LE80578=y
+#CONFIG_FB_MATROX_G=y
+#CONFIG_FB_MATROX_I2C=y
+#CONFIG_FB_MATROX_MAVEN=y
+#CONFIG_FB_MATROX_MILLENIUM=y
+#CONFIG_FB_MATROX_MYSTIQUE=y
+#CONFIG_FB_MATROX=y
+#CONFIG_FB_MB862XX_I2C=y
+#CONFIG_FB_MB862XX_PCI_GDC=y
+#CONFIG_FB_MB862XX=y
+#CONFIG_FB_METRONOME=y
+#CONFIG_FB_NEOMAGIC=y
+#CONFIG_FB_NVIDIA_BACKLIGHT=y
+#CONFIG_FB_NVIDIA_I2C=y
+#CONFIG_FB_NVIDIA=y
+#CONFIG_FB_PM2_FIFO_DISCONNECT=y
+#CONFIG_FB_PM2=y
+#CONFIG_FB_PM3=y
+#CONFIG_FB_RADEON_BACKLIGHT=y
+#CONFIG_FB_RADEON_I2C=y
+#CONFIG_FB_RADEON=y
+#CONFIG_FB_RIVA_BACKLIGHT=y
+#CONFIG_FB_RIVA_I2C=y
+#CONFIG_FB_RIVA=y
+#CONFIG_FB_S3_DDC=y
+#CONFIG_FB_S3=y
+#CONFIG_FB_SAVAGE_ACCEL=y
+#CONFIG_FB_SAVAGE_I2C=y
+#CONFIG_FB_SAVAGE=y
+#CONFIG_FB_SIS_300=y
+#CONFIG_FB_SIS_315=y
+#CONFIG_FB_SIS=y
+#CONFIG_FB_SMSCUFX=y
+#CONFIG_FB_SVGALIB=y
+#CONFIG_FB_SYS_COPYAREA=y
+#CONFIG_FB_SYS_FILLRECT=y
+#CONFIG_FB_SYS_FOPS=y
+#CONFIG_FB_SYS_IMAGEBLIT=y
+#CONFIG_FB_TRIDENT=y
+#CONFIG_FB_UDL=y
+CONFIG_FB_VESA=y
+#CONFIG_FB_VIA_X_COMPATIBILITY=y
+#CONFIG_FB_VIA=y
+#CONFIG_FB_VOODOO1=y
+#CONFIG_FB_VT8623=y
+=======
+>>>>>>> 50e92b9f7e911d327b9d5d271e40b519ed6eb47c
 CONFIG_FEALNX=y
 CONFIG_FORCEDETH=y
 CONFIG_GENERIC_GPIO=y