s3c24xx: do not override CONFIG_WIRELESS, this breaks packages

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

diff --git a/target/linux/ps3/config-2.6.28 b/target/linux/ps3/config-2.6.28
index afcacf2..38be14b 100644 (file)
--- a/target/linux/ps3/config-2.6.28
+++ b/target/linux/ps3/config-2.6.28
@@ -38,7 +38,6 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_BRK=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_COMPAT_BRK=y

-# CONFIG_CONFIGFS_FS is not set

 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_CRC16=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_CRC16=y


@@ -59,7 +58,6 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"

-CONFIG_DEFAULT_TCP_CONG="cubic"

 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
 CONFIG_DNOTIFY=y
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVKMEM=y
 CONFIG_DNOTIFY=y


@@ -113,7 +111,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAME_WARN=2048
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAME_WARN=2048

-# CONFIG_FREEZER is not set

 # CONFIG_FSL_ULI1575 is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_GELIC_NET=y
 # CONFIG_FSL_ULI1575 is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_GELIC_NET=y


@@ -135,7 +132,6 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HAS_RAPIDIO is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 # CONFIG_HAS_RAPIDIO is not set

-# CONFIG_HAVE_AOUT is not set

 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y


@@ -169,9 +165,12 @@ CONFIG_INITRAMFS_SOURCE="/home/geoff/projects/cell/bootloader/openwrt-feeds/buil
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y

+CONFIG_INPUT_EVBUG=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_JOYDEV=m

 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_MOUSEDEV=y

-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_PSAUX=y

 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_IOMMU_HELPER=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_IOMMU_HELPER=y


@@ -212,7 +211,6 @@ CONFIG_JBD2=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y
 # CONFIG_JOYSTICK_ZHENHUA is not set
 CONFIG_KERNEL_START=0xc000000000000000
 CONFIG_KEXEC=y

-CONFIG_KMOD=y

 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCKD=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_LOCKD=y
 CONFIG_LOCK_KERNEL=y


@@ -225,8 +223,6 @@ CONFIG_LOG_BUF_SHIFT=15
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 # CONFIG_MEMORY_HOTREMOVE is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 # CONFIG_MEMORY_HOTREMOVE is not set

-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TMIO is not set

 CONFIG_MIGRATION=y
 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MMIO_NVRAM is not set
 CONFIG_MIGRATION=y
 # CONFIG_MISC_DEVICES is not set
 # CONFIG_MMIO_NVRAM is not set


@@ -313,10 +309,16 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
 # CONFIG_SCSI_PROC_FS is not set

-CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_8250 is not set

-# CONFIG_SHMEM is not set

 CONFIG_SMP=y
 CONFIG_SMP=y

+CONFIG_SND=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PPC=y
+CONFIG_SND_PS3=m
+CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
+CONFIG_SND_TIMER=m
+CONFIG_SOUND=m
+# CONFIG_SOUND_OSS_CORE is not set

 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_MANUAL=y


@@ -324,15 +326,10 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 # CONFIG_SPU_BASE is not set
 # CONFIG_SPU_FS is not set
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 # CONFIG_SPU_BASE is not set
 # CONFIG_SPU_FS is not set

-CONFIG_SSB_POSSIBLE=y

 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y

-# CONFIG_SYN_COOKIES is not set

 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set

-# CONFIG_SYSVIPC is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TINY_SHMEM=y
+CONFIG_SYSVIPC_COMPAT=y

 CONFIG_TUNE_CELL=y
 # CONFIG_U3_DART is not set
 CONFIG_USB=y
 CONFIG_TUNE_CELL=y
 # CONFIG_U3_DART is not set
 CONFIG_USB=y