From 10a781acf2aa69f2c68808887e6de8e85a3e1acb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 22 Jun 2007 03:49:54 +0000 Subject: [PATCH] brcm47xx-2.6: update for 2.6.22-rc5 SVN-Revision: 7699 --- target/linux/brcm47xx-2.6/config/default | 28 ++++++++---------------- target/linux/generic-2.6/config-2.6.22 | 2 ++ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default index f85b4a1177..03c0d4e721 100644 --- a/target/linux/brcm47xx-2.6/config/default +++ b/target/linux/brcm47xx-2.6/config/default @@ -4,9 +4,10 @@ CONFIG_32BIT=y # CONFIG_8139TOO is not set # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_ARPD is not set -# CONFIG_ATM_DRIVERS is not set # CONFIG_ATMEL is not set +# CONFIG_ATM_DRIVERS is not set CONFIG_B44=y CONFIG_BASE_SMALL=0 # CONFIG_BCM43XX is not set @@ -77,6 +78,7 @@ CONFIG_CRYPTO_MD5=m # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_DDB5477 is not set +CONFIG_DEVPORT=y # CONFIG_DM9000 is not set CONFIG_DMA_NEED_PCI_MAP_STATE=y CONFIG_DMA_NONCOHERENT=y @@ -86,6 +88,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_GPIO=y # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set # CONFIG_GEN_RTC is not set +CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HID=m @@ -123,35 +126,19 @@ CONFIG_JFFS2_FS_DEBUG=0 # CONFIG_MACH_VR41XX is not set CONFIG_MIPS=y # CONFIG_MIPS_ATLAS is not set -# CONFIG_MIPS_BOSPORUS is not set # CONFIG_MIPS_COBALT is not set -# CONFIG_MIPS_DB1000 is not set -# CONFIG_MIPS_DB1100 is not set -# CONFIG_MIPS_DB1200 is not set -# CONFIG_MIPS_DB1500 is not set -# CONFIG_MIPS_DB1550 is not set # CONFIG_MIPS_EV64120 is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MALTA is not set -# CONFIG_MIPS_MIRAGE is not set -# CONFIG_MIPS_MTX1 is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set # CONFIG_MIPS_MT_SMTC is not set -# CONFIG_MIPS_PB1000 is not set -# CONFIG_MIPS_PB1100 is not set -# CONFIG_MIPS_PB1200 is not set -# CONFIG_MIPS_PB1500 is not set -# CONFIG_MIPS_PB1550 is not set # CONFIG_MIPS_SEAD is not set # CONFIG_MIPS_SIM is not set # CONFIG_MIPS_VPE_LOADER is not set -# CONFIG_MIPS_XXS1500 is not set -# CONFIG_MOMENCO_JAGUAR_ATX is not set # CONFIG_MOMENCO_OCELOT is not set # CONFIG_MOMENCO_OCELOT_3 is not set # CONFIG_MOMENCO_OCELOT_C is not set -# CONFIG_MOMENCO_OCELOT_G is not set CONFIG_MTD=y # CONFIG_MTD_ABSENT is not set CONFIG_MTD_BCM47XX=y @@ -185,7 +172,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # CONFIG_MTD_ONENAND is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_PCI is not set @@ -223,6 +209,7 @@ CONFIG_PAGE_SIZE_4KB=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y # CONFIG_SCSI_MULTI_LUN is not set +CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_MANY_PORTS is not set @@ -243,6 +230,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SSB=y CONFIG_SSB_DEBUG=y +# CONFIG_SSB_DRIVER_MIPS is not set CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_PCICORE_HOSTMODE=y CONFIG_SSB_PCIHOST=y @@ -265,11 +253,11 @@ CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_EHCI_SPLIT_ISO=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set -# CONFIG_USB_GTCO is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_SSB is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_STORAGE_ALAUDA is not set @@ -282,5 +270,7 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_USBAT is not set CONFIG_USB_UHCI_HCD=m +# CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set # CONFIG_WATCHDOG is not set +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index 32782f5e91..b060d4a605 100644 --- a/target/linux/generic-2.6/config-2.6.22 +++ b/target/linux/generic-2.6/config-2.6.22 @@ -448,6 +448,7 @@ CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_MISC is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_POLLDEV is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_TSDEV is not set @@ -641,6 +642,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LEGACY_PTYS is not set CONFIG_LIBCRC32C=m +# CONFIG_LIBERTAS is not set # CONFIG_LIBERTAS_USB is not set CONFIG_LLC=y CONFIG_LLC2=m -- 2.25.1