aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/sh/configs/sh7785lcr_defconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-27 14:06:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-27 14:06:26 +0900
commitfc4967b8c6a1540ebce9ac48e44b8d44e7fac971 (patch)
treea40b3c06e74ca16e29a6bd66c6f09ce7d579bbc6 /arch/sh/configs/sh7785lcr_defconfig
parentMerge branches 'sh/stable-updates' and 'sh/pci-rework' (diff)
downloadwireguard-linux-fc4967b8c6a1540ebce9ac48e44b8d44e7fac971.tar.xz
wireguard-linux-fc4967b8c6a1540ebce9ac48e44b8d44e7fac971.zip
sh: update defconfigs for PCI changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/configs/sh7785lcr_defconfig')
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index e4fac2efc055..4385fe97a780 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30-rc2
-# Wed Apr 22 19:17:56 2009
+# Linux kernel version: 2.6.30-rc3
+# Mon Apr 27 13:11:48 2009
#
CONFIG_SUPERH=y
CONFIG_SUPERH32=y
@@ -307,8 +307,6 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
#
CONFIG_PCI=y
CONFIG_SH_PCIDMA_NONCOHERENT=y
-CONFIG_PCI_AUTO=y
-CONFIG_PCI_AUTO_UPDATE_RESOURCES=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_PCI_LEGACY=y