ixp4xx: the missing phy_disconnect call has been added in upstream, remove that patch

[openwrt.git] / target / linux / mpc52xx / config-2.6.30

diff --git a/target/linux/mpc52xx/config-2.6.30 b/target/linux/mpc52xx/config-2.6.30
index 35c4fc1..e038cff 100644 (file)
--- a/target/linux/mpc52xx/config-2.6.30
+++ b/target/linux/mpc52xx/config-2.6.30
@@ -34,13 +34,10 @@ CONFIG_COMPAT_BRK=y
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_CRYPTO_AEAD2=y
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ARC4 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ECB is not set
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HW=y
@@ -122,9 +119,6 @@ CONFIG_HZ_250=y
 # CONFIG_I2C is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -157,7 +151,6 @@ CONFIG_MIGRATION=y
 # CONFIG_MPIC_WEIRD is not set
 # CONFIG_MTD is not set
 # CONFIG_NETDEV_1000 is not set
-# CONFIG_NETFILTER is not set
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NEW_LEDS is not set
@@ -242,11 +235,11 @@ CONFIG_SECCOMP=y
 CONFIG_SERIAL_MPC52xx=y
 CONFIG_SERIAL_MPC52xx_CONSOLE=y
 CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
-# CONFIG_SIMPLE_GPIO is not set
 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SLUB=y
 # CONFIG_SMP is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
 # CONFIG_SQUASHFS is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_SUSPEND=y
@@ -268,7 +261,5 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
 # CONFIG_VLAN_8021Q is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_WATCHDOG is not set
-# CONFIG_WIRELESS is not set
 # CONFIG_WLAN_80211 is not set
 CONFIG_WORD_SIZE=32
-CONFIG_XFRM_USER=m