rsyslog

1 files changed, 49 insertions, 44 deletions

diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config
index ed8f8cf9..a2e646a1 100644
--- a/data/kernel.wanted.config
+++ b/data/kernel.wanted.config
@@ -1,24 +1,24 @@
 CONFIG_8139CP=y
+CONFIG_8139TOO=y
 CONFIG_8139TOO_8129=y
 CONFIG_8139TOO_PIO=y
 CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO=y
 CONFIG_ACENIC=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_VIA=y
+CONFIG_ATL1=y
 CONFIG_ATL1C=y
 CONFIG_ATL1E=y
-CONFIG_ATL1=y
 CONFIG_ATL2=y
 CONFIG_ATP=y
 CONFIG_AUFS_BDEV_LOOP=y
 CONFIG_AUFS_BRANCH_MAX_127=y
 CONFIG_AUFS_FS=y
 CONFIG_AUFS_SBILIST=y
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
 CONFIG_B44=y
+CONFIG_B44_PCI=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_BACKLIGHT_ADP8860=y
 CONFIG_BACKLIGHT_ADP8870=y
 CONFIG_BACKLIGHT_APPLE=y
@@ -28,19 +28,19 @@ CONFIG_BACKLIGHT_PROGEAR=y
 CONFIG_BACKLIGHT_SAHARA=y
 CONFIG_BE2NET=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_NBD=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=y
 CONFIG_BNA=y
-CONFIG_BNX2X=y
 CONFIG_BNX2=y
+CONFIG_BNX2X=y
 CONFIG_CASSINI=y
-CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=y
+CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=y
-CONFIG_CHELSIO_T4VF=y
 CONFIG_CHELSIO_T4=y
+CONFIG_CHELSIO_T4VF=y
 CONFIG_CNIC=y
 CONFIG_CRC16=y
 CONFIG_CRC_CCITT=y
@@ -52,44 +52,47 @@ CONFIG_DL2K=y
 CONFIG_DM9102=y
 CONFIG_DNET=y
 CONFIG_DRM=y
-CONFIG_DRM_AST=y
-CONFIG_DRM_CIRRUS_QEMU=y
+CONFIG_DRM_AST=n
+CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_GMA3600=y
-CONFIG_DRM_GMA500=y
-CONFIG_DRM_I2C_CH7006=y
-CONFIG_DRM_I2C_SIL164=y
-CONFIG_DRM_I810=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I915=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_MGAG200=y
-CONFIG_DRM_MGA=y
+CONFIG_DRM_MGA=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=y
-CONFIG_DRM_R128=y
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
-CONFIG_DRM_RADEON=y
-CONFIG_DRM_SAVAGE=y
-CONFIG_DRM_SIS=y
-CONFIG_DRM_TDFX=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_UDL=y
-CONFIG_DRM_USB=y
-CONFIG_DRM_VIA=y
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_TTM=m
+CONFIG_DRM_UDL=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_VMWGFX=y
-CONFIG_E1000E=y
 CONFIG_E1000=y
+CONFIG_E1000E=y
 CONFIG_E100=y
 CONFIG_ENIC=y
 CONFIG_EPIC100=y
 CONFIG_ETHERNET=y
 CONFIG_ETHOC=y
 CONFIG_EXPORTFS=y
+CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS=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
@@ -165,20 +168,23 @@ CONFIG_FB_VESA=y
 #CONFIG_FB_VIA=y
 #CONFIG_FB_VOODOO1=y
 #CONFIG_FB_VT8623=y
+=======
+>>>>>>> 50e92b9f7e911d327b9d5d271e40b519ed6eb47c
 CONFIG_FEALNX=y
 CONFIG_FORCEDETH=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GPIOLIB=y
 CONFIG_HAPPYMEAL=y
 CONFIG_HP100=y
-CONFIG_IGBVF=y
 CONFIG_IGB=y
+CONFIG_IGBVF=y
 CONFIG_IP1000=y
-CONFIG_IXGBEVF=y
-CONFIG_IXGBE=y
 CONFIG_IXGB=y
+CONFIG_IXGBE=y
+CONFIG_IXGBEVF=y
 CONFIG_JBD2=y
 CONFIG_JME=y
+CONFIG_KERNEL_XZ=y
 CONFIG_KS8851_MLL=y
 CONFIG_KSZ884X_PCI=y
 CONFIG_LCD_CLASS_DEVICE=y
@@ -191,6 +197,7 @@ CONFIG_MLX4_EN=y
 CONFIG_MYRI10GE=y
 CONFIG_NATSEMI=y
 CONFIG_NE2K_PCI=y
+CONFIG_NETXEN_NIC=y
 CONFIG_NET_CALXEDA_XGMAC=y
 CONFIG_NET_PACKET_ENGINE=y
 CONFIG_NET_TULIP=y
@@ -232,7 +239,6 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_NETXEN_NIC=y
 CONFIG_NIU=y
 CONFIG_NS83820=y
 CONFIG_OVERLAYFS_FS=y
@@ -248,48 +254,48 @@ CONFIG_R8169=y
 CONFIG_S2IO=y
 CONFIG_SC92031=y
 CONFIG_SEEQ8005=y
-CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC=y
+CONFIG_SFC_MCDI_MON=y
 CONFIG_SIS190=y
 CONFIG_SIS900=y
 CONFIG_SKGE=y
 CONFIG_SKY2=y
 CONFIG_SMSC9420=y
 CONFIG_SMSC_PHY=y
+CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB=y
 CONFIG_SSB_DRIVER_PCICORE=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_SPROM=y
-CONFIG_SSB=y
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PCI=y
 CONFIG_STMMAC_PLATFORM=y
 CONFIG_STMMAC_RING=y
 CONFIG_STUB_POULSBO=y
-CONFIG_SUNDANCE_MMIO=y
 CONFIG_SUNDANCE=y
-CONFIG_SUNGEM_PHY=y
+CONFIG_SUNDANCE_MMIO=y
 CONFIG_SUNGEM=y
+CONFIG_SUNGEM_PHY=y
 CONFIG_TIGON3=y
 CONFIG_TLAN=y
 CONFIG_TULIP=y
 CONFIG_TYPHOON=y
 CONFIG_UIO=y
 CONFIG_ULI526X=y
-CONFIG_USB_HID=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_HID=y
 CONFIG_VGASTATE=y
 CONFIG_VGA_SWITCHEROO=y
-CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE=y
+CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=y
 CONFIG_VMXNET3=y
 CONFIG_VORTEX=y
@@ -297,4 +303,3 @@ CONFIG_VXGE=y
 CONFIG_WINBOND_840=y
 CONFIG_XFS_FS=y
 CONFIG_ZNET=y
-CONFIG_KERNEL_XZ=y