update patch for the final kernel release

[openwrt.git] / target / linux / rdc / config-2.6.25

diff --git a/target/linux/rdc/config-2.6.25 b/target/linux/rdc/config-2.6.25
index 60170fa..afd2c25 100644 (file)
--- a/target/linux/rdc/config-2.6.25
+++ b/target/linux/rdc/config-2.6.25
@@ -2,11 +2,11 @@
 # CONFIG_64BIT is not set
 # CONFIG_8139TOO is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_64BIT is not set
 # CONFIG_8139TOO is not set
 # CONFIG_ACQUIRE_WDT is not set

-CONFIG_ADM6996_PHY=y

 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_AGP is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set

+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"

 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set


@@ -49,7 +49,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_IO_DELAY_TYPE=0

-CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig"

 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
 # CONFIG_DELL_RBU is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set


@@ -63,7 +62,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_EDD is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_FAST_CMPXCHG_LOCAL=y

-CONFIG_FIXED_PHY=y
+# CONFIG_FIXED_PHY is not set

 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_BUG=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_BUG=y


@@ -149,6 +148,7 @@ CONFIG_KEXEC=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KVM is not set
 # CONFIG_LATENCYTOP is not set

+CONFIG_LBD=y

 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LGUEST is not set
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LGUEST is not set


@@ -168,7 +168,7 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set

-CONFIG_MDIO_BITBANG=y
+# CONFIG_MDIO_BITBANG is not set

 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_MGEODEGX1 is not set


@@ -245,7 +245,6 @@ CONFIG_MTD_RDC3210_SIZE=0x400000
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NOHIGHMEM=y
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NOHIGHMEM=y

-CONFIG_NO_HZ=y

 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000


@@ -273,8 +272,8 @@ CONFIG_PHYSICAL_START=0x100000
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_R6040=m
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_R6040=m

-CONFIG_REALTEK_PHY=y
-CONFIG_RELOCATABLE=y
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_RELOCATABLE is not set

 # CONFIG_RTC is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_RTC is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y


@@ -284,7 +283,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set

-# CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m


@@ -305,7 +304,7 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_THERMAL is not set
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_THERMAL is not set

-CONFIG_TICK_ONESHOT=y
+# CONFIG_TICK_ONESHOT is not set

 # CONFIG_TOSHIBA is not set
 CONFIG_UID16=y
 CONFIG_USB=m
 # CONFIG_TOSHIBA is not set
 CONFIG_UID16=y
 CONFIG_USB=m


@@ -361,7 +360,7 @@ CONFIG_X86_MSR=y
 # CONFIG_X86_PAE is not set
 # CONFIG_X86_PC is not set
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_PAE is not set
 # CONFIG_X86_PC is not set
 CONFIG_X86_POPAD_OK=y

-# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_PPRO_FENCE=y

 CONFIG_X86_RDC321X=y
 CONFIG_X86_REBOOTFIXUPS=y
 # CONFIG_X86_SUMMIT is not set
 CONFIG_X86_RDC321X=y
 CONFIG_X86_REBOOTFIXUPS=y
 # CONFIG_X86_SUMMIT is not set