From 6f47bb5863f7f77d8110cec3b9bd001bbbf3d26e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 4 May 2014 19:39:46 +0100
Subject: [PATCH] minor generic cleanups, no overall change

---
 config-generic | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/config-generic b/config-generic
index f9deefe9e..d5730dff1 100644
--- a/config-generic
+++ b/config-generic
@@ -123,8 +123,8 @@ CONFIG_YENTA=m
 CONFIG_CARDBUS=y
 CONFIG_I82092=m
 CONFIG_PD6729=m
-
 CONFIG_PCCARD=y
+
 CONFIG_MMC=m
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
@@ -528,6 +528,11 @@ CONFIG_SCSI_LPFC=m
 # PCMCIA SCSI adapter support
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+
 CONFIG_ATA=y
 CONFIG_ATA_BMDMA=y
 CONFIG_ATA_VERBOSE_ERROR=y
@@ -607,6 +612,8 @@ CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
 CONFIG_PATA_ATP867X=m
 
+CONFIG_ATA_OVER_ETH=m
+
 # CONFIG_MCB is not set
 
 #
@@ -678,10 +685,6 @@ CONFIG_FIREWIRE_NOSY=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 
-#
-# IEEE 1394 (FireWire) support
-#
-
 #
 # I2O device support
 #
@@ -1082,7 +1085,7 @@ CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 
 #
-# SCTP Configuration (EXPERIMENTAL)
+# SCTP Configuration
 #
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
@@ -1474,6 +1477,8 @@ CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
 
+CONFIG_NET_VENDOR_SMC=y
+
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -1850,6 +1855,9 @@ CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
 
+#
+# Near Field Communication (NFC) devices
+#
 CONFIG_NFC=m
 CONFIG_NFC_DIGITAL=m
 CONFIG_NFC_NCI=m
@@ -1857,12 +1865,9 @@ CONFIG_NFC_HCI=m
 CONFIG_NFC_SHDLC=y
 CONFIG_NFC_LLCP=y
 CONFIG_NFC_SIM=m
+
 CONFIG_NFC_MRVL=m
 CONFIG_NFC_MRVL_USB=m
-
-#
-# Near Field Communication (NFC) devices
-#
 CONFIG_NFC_PORT100=m
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
@@ -2857,7 +2862,7 @@ CONFIG_R3964=m
 # CONFIG_SONYPI is not set
 
 #
-# Ftape, the floppy tape device driver
+# AGP Support
 #
 CONFIG_AGP=y
 CONFIG_AGP_ALI=y
@@ -3518,9 +3523,6 @@ CONFIG_USB_XHCI_HCD=y
 # USB Device Class drivers
 #
 
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
@@ -4524,7 +4526,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 
-CONFIG_ATA_OVER_ETH=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_GENERIC is not set
@@ -4637,7 +4638,6 @@ CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 
 
-CONFIG_NET_VENDOR_SMC=y
 # CONFIG_IBMTR is not set
 # CONFIG_SKISA is not set
 # CONFIG_PROTEON is not set
@@ -5027,11 +5027,6 @@ CONFIG_ALTERA_STAPL=m
 #
 # CONFIG_STE_MODEM_RPROC is not set
 
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-
 CONFIG_NOP_USB_XCEIV=m
 
 # CONFIG_IMA is not set