ixp4xx-2.6/config: Removed the PPP config override to allow PPP modules to be built

[openwrt.git] / target / linux / ixp4xx-2.6 / config / default

diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 3952183..7cac0b2 100644 (file)
--- a/target/linux/ixp4xx-2.6/config/default
+++ b/target/linux/ixp4xx-2.6/config/default
@@ -8,6 +8,7 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
@@ -15,16 +16,20 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
+CONFIG_ARCH_IXCDP1100=y
 CONFIG_ARCH_IXDP425=y
 CONFIG_ARCH_IXDP4XX=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 CONFIG_ARCH_IXP4XX=y
+# CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_OMAP is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PRPMC1100 is not set
@@ -54,7 +59,6 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BONDING is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
@@ -120,6 +124,9 @@ CONFIG_HDLC_PPP=m
 CONFIG_HDLC_RAW=m
 # CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HERMES is not set
+CONFIG_HID=m
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HID_FF is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y
@@ -139,6 +146,7 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_DEBUG_CORE is not set
+CONFIG_I2C_GPIO=y
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_IOP3XX is not set
@@ -161,6 +169,7 @@ CONFIG_I2C_IXP4XX=y
 # CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_INPUT=m
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
@@ -202,20 +211,26 @@ CONFIG_IXP4XX_NPE_FW_MTD=y
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_CRYPTO=y
 CONFIG_IXP4XX_WATCHDOG=y
+# CONFIG_IWMMXT is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFS_FS is not set
+# CONFIG_KEXEC is not set
 # CONFIG_LANMEDIA is not set
+CONFIG_LEDS_IXP4XX=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
 CONFIG_MACH_AVILA=y
 CONFIG_MACH_COMPEX=y
+CONFIG_MACH_DSMG600=y
+CONFIG_MACH_FSG=y
 CONFIG_MACH_GATEWAY7001=y
 # CONFIG_MACH_GTWX5715 is not set
 # CONFIG_MACH_IXDP465 is not set
 # CONFIG_MACH_IXDPG425 is not set
+# CONFIG_MACH_KIXRP435 is not set
 CONFIG_MACH_LOFT=y
 CONFIG_MACH_NAS100D=y
 CONFIG_MACH_NSLU2=y
@@ -282,21 +297,13 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-CONFIG_NETFILTER_NETLINK=m
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+# CONFIG_NETDEV_1000 is not set
 # CONFIG_NET_CLS_ACT is not set
 # CONFIG_NET_CLS_IND is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NEW_LEDS is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
@@ -318,6 +325,7 @@ CONFIG_PATA_ARTOP=m
 # CONFIG_PATA_HPT37X is not set
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IXP4XX_CF=m
 # CONFIG_PATA_IT821X is not set
 # CONFIG_PATA_JMICRON is not set
 # CONFIG_PATA_MPIIX is not set
@@ -343,7 +351,6 @@ CONFIG_PATA_ARTOP=m
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PM is not set
-# CONFIG_PPP is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -354,7 +361,7 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
+CONFIG_RTC_DRV_ISL1208=y
 # CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_PCF8563=y
 # CONFIG_RTC_DRV_PCF8583 is not set
@@ -389,6 +396,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -416,6 +424,7 @@ CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -431,13 +440,13 @@ CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SHMEM is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SWAP is not set
@@ -450,38 +459,20 @@ CONFIG_TCP_CONG_VEGAS=m
 # CONFIG_TCP_CONG_VENO is not set
 CONFIG_TCP_CONG_WESTWOOD=y
 CONFIG_TINY_SHMEM=y
-# CONFIG_TUN is not set
 CONFIG_UID16=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
 CONFIG_USB_BANDWIDTH=y
-# CONFIG_USB_CATC is not set
 CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_KAWETH is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_GTCO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_ZD1201 is not set
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VIA_RHINE is not set
+CONFIG_VIA_VELOCITY=m
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WAN=y
 # CONFIG_WANXL is not set