generic-2.6: sync patches to 2.6.33.1

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

diff --git a/target/linux/ps3/config-2.6.30 b/target/linux/ps3/config-2.6.30
index b942316..2fad43e 100644 (file)
--- a/target/linux/ps3/config-2.6.30
+++ b/target/linux/ps3/config-2.6.30
@@ -48,7 +48,6 @@ CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
-# CONFIG_EDAC is not set
 CONFIG_ELF_CORE=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_EXT2_FS=y
@@ -133,7 +132,6 @@ CONFIG_HW_CONSOLE=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y
-# CONFIG_I2C is not set
 CONFIG_INITRAMFS_ROOT_GID=500
 CONFIG_INITRAMFS_ROOT_UID=500
 CONFIG_INOTIFY_USER=y
@@ -155,7 +153,6 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_IRQ_PER_CPU=y
 # CONFIG_IRQSTACKS is not set
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISDN is not set
 CONFIG_ISO9660_FS=y
 CONFIG_JBD2=y
 CONFIG_JBD=y
@@ -186,7 +183,6 @@ CONFIG_KEXEC=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_LOGO is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTREMOVE is not set
@@ -213,7 +209,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc000000000000000
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCI_DOMAINS is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PHYSICAL_START=0x00000000