Commit 7faf92a4 authored by David S. Miller's avatar David S. Miller

[SPARC64]: Include infiniband driver config and update defconfig.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a22e725a
...@@ -591,6 +591,8 @@ source "sound/Kconfig" ...@@ -591,6 +591,8 @@ source "sound/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "drivers/infiniband/Kconfig"
source "drivers/char/watchdog/Kconfig" source "drivers/char/watchdog/Kconfig"
source "arch/sparc64/oprofile/Kconfig" source "arch/sparc64/oprofile/Kconfig"
......
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.10-rc3 # Linux kernel version: 2.6.10
# Wed Dec 8 21:14:26 2004 # Mon Dec 27 22:36:56 2004
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_MMU=y CONFIG_MMU=y
...@@ -674,6 +674,7 @@ CONFIG_BRIDGE_EBT_MARK_T=m ...@@ -674,6 +674,7 @@ CONFIG_BRIDGE_EBT_MARK_T=m
CONFIG_BRIDGE_EBT_REDIRECT=m CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_LOG=m
CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_XFRM=y CONFIG_XFRM=y
CONFIG_XFRM_USER=m CONFIG_XFRM_USER=m
...@@ -740,6 +741,7 @@ CONFIG_NET_CLS_FW=m ...@@ -740,6 +741,7 @@ CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_PERF=y
CONFIG_NET_CLS_IND=y CONFIG_NET_CLS_IND=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_ACT=y
...@@ -925,6 +927,7 @@ CONFIG_HAMACHI=m ...@@ -925,6 +927,7 @@ CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m CONFIG_YELLOWFIN=m
CONFIG_R8169=m CONFIG_R8169=m
CONFIG_R8169_NAPI=y CONFIG_R8169_NAPI=y
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m CONFIG_TIGON3=m
...@@ -936,6 +939,7 @@ CONFIG_IXGB=m ...@@ -936,6 +939,7 @@ CONFIG_IXGB=m
CONFIG_IXGB_NAPI=y CONFIG_IXGB_NAPI=y
CONFIG_S2IO=m CONFIG_S2IO=m
CONFIG_S2IO_NAPI=y CONFIG_S2IO_NAPI=y
CONFIG_2BUFF_MODE=y
# #
# Token Ring devices # Token Ring devices
...@@ -1332,7 +1336,7 @@ CONFIG_SMB_FS=m ...@@ -1332,7 +1336,7 @@ CONFIG_SMB_FS=m
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set # CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_XATTR is not set
CONFIG_CIFS_POSIX=y # CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_NCP_FS=m CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set
...@@ -1459,7 +1463,7 @@ CONFIG_DVB_BUDGET_PATCH=m ...@@ -1459,7 +1463,7 @@ CONFIG_DVB_BUDGET_PATCH=m
# CONFIG_DVB_TTUSB_BUDGET is not set # CONFIG_DVB_TTUSB_BUDGET is not set
CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_TTUSB_DEC=m
CONFIG_DVB_DIBUSB=m CONFIG_DVB_DIBUSB=m
CONFIG_DVB_DIBUSB_MISDESIGNED_AN2235=y # CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES is not set
CONFIG_DVB_DIBCOM_DEBUG=y CONFIG_DVB_DIBCOM_DEBUG=y
CONFIG_DVB_CINERGYT2=m CONFIG_DVB_CINERGYT2=m
# CONFIG_DVB_CINERGYT2_TUNING is not set # CONFIG_DVB_CINERGYT2_TUNING is not set
...@@ -1468,6 +1472,7 @@ CONFIG_DVB_CINERGYT2=m ...@@ -1468,6 +1472,7 @@ CONFIG_DVB_CINERGYT2=m
# Supported FlexCopII (B2C2) Adapters # Supported FlexCopII (B2C2) Adapters
# #
CONFIG_DVB_B2C2_SKYSTAR=m CONFIG_DVB_B2C2_SKYSTAR=m
CONFIG_DVB_B2C2_USB=m
# #
# Supported BT878 Adapters # Supported BT878 Adapters
...@@ -1504,6 +1509,7 @@ CONFIG_DVB_TDA1004X=m ...@@ -1504,6 +1509,7 @@ CONFIG_DVB_TDA1004X=m
CONFIG_DVB_NXT6000=m CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m CONFIG_DVB_MT352=m
CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
# #
# DVB-C (cable) frontends # DVB-C (cable) frontends
...@@ -1635,6 +1641,7 @@ CONFIG_USB_EHCI_HCD=m ...@@ -1635,6 +1641,7 @@ CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_UHCI_HCD=m CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
# #
# USB Device Class drivers # USB Device Class drivers
...@@ -1805,6 +1812,15 @@ CONFIG_USB_SPEEDTOUCH=m ...@@ -1805,6 +1812,15 @@ CONFIG_USB_SPEEDTOUCH=m
# #
# CONFIG_USB_GADGET is not set # CONFIG_USB_GADGET is not set
#
# InfiniBand support
#
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_MTHCA=m
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
CONFIG_INFINIBAND_IPOIB=m
# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
# #
# Watchdog Cards # Watchdog Cards
# #
...@@ -1890,6 +1906,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m ...@@ -1890,6 +1906,10 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
#
# Hardware crypto devices
#
# #
# Library routines # Library routines
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment