Magellan Linux

Diff of /trunk/kernel-alx/config-3.10.46-alx-r1-i486

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2471 by niro, Wed Jul 2 10:01:42 2014 UTC revision 2472 by niro, Wed Jul 2 11:01:50 2014 UTC
# Line 1  Line 1 
1  #  #
2  # Automatically generated file; DO NOT EDIT.  # Automatically generated file; DO NOT EDIT.
3  # Linux/x86 3.10.12-alx-r1 Kernel Configuration  # Linux/x86 3.10.46-alx-r1 Kernel Configuration
4  #  #
5  # CONFIG_64BIT is not set  # CONFIG_64BIT is not set
6  CONFIG_X86_32=y  CONFIG_X86_32=y
# Line 1094  CONFIG_PATA_LEGACY=m Line 1094  CONFIG_PATA_LEGACY=m
1094  CONFIG_MD=y  CONFIG_MD=y
1095  # CONFIG_BLK_DEV_MD is not set  # CONFIG_BLK_DEV_MD is not set
1096  # CONFIG_BCACHE is not set  # CONFIG_BCACHE is not set
1097    CONFIG_BLK_DEV_DM_BUILTIN=y
1098  CONFIG_BLK_DEV_DM=m  CONFIG_BLK_DEV_DM=m
1099  # CONFIG_DM_DEBUG is not set  # CONFIG_DM_DEBUG is not set
1100  CONFIG_DM_CRYPT=m  CONFIG_DM_CRYPT=m
# Line 2783  CONFIG_DMA_ACPI=y Line 2784  CONFIG_DMA_ACPI=y
2784  #  #
2785  # DMA Clients  # DMA Clients
2786  #  #
 CONFIG_NET_DMA=y  
2787  # CONFIG_ASYNC_TX_DMA is not set  # CONFIG_ASYNC_TX_DMA is not set
2788  # CONFIG_DMATEST is not set  # CONFIG_DMATEST is not set
2789  CONFIG_DCA=m  CONFIG_DCA=m
# Line 2825  CONFIG_USBIP_HOST=m Line 2825  CONFIG_USBIP_HOST=m
2825  # CONFIG_RTL8192U is not set  # CONFIG_RTL8192U is not set
2826  # CONFIG_RTLLIB is not set  # CONFIG_RTLLIB is not set
2827  # CONFIG_R8712U is not set  # CONFIG_R8712U is not set
2828  # CONFIG_RTS5139 is not set  CONFIG_RTS5139=m
2829    # CONFIG_RTS5139_DEBUG is not set
2830  # CONFIG_TRANZPORT is not set  # CONFIG_TRANZPORT is not set
2831  # CONFIG_IDE_PHISON is not set  # CONFIG_IDE_PHISON is not set
2832  # CONFIG_LINE6_USB is not set  # CONFIG_LINE6_USB is not set

Legend:
Removed from v.2471  
changed lines
  Added in v.2472