From dd9eae39aa872ec8401e04d3eda6fb1433459eb8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 2 Sep 2007 15:15:13 +0000 Subject: linux-rp: Sync with Poky (adding 2.6.22 in the process) --- packages/linux/linux-rp-2.6.21/defconfig-akita | 1 + packages/linux/linux-rp-2.6.21/defconfig-c7x0 | 1 + packages/linux/linux-rp-2.6.21/defconfig-hx2000 | 1 + packages/linux/linux-rp-2.6.21/defconfig-poodle | 1 + packages/linux/linux-rp-2.6.21/defconfig-qemuarm | 1 + packages/linux/linux-rp-2.6.21/defconfig-qemux86 | 1 + packages/linux/linux-rp-2.6.21/defconfig-spitz | 46 ++++++++++++++++++++++-- packages/linux/linux-rp-2.6.21/defconfig-tosa | 1 + 8 files changed, 50 insertions(+), 3 deletions(-) (limited to 'packages/linux/linux-rp-2.6.21') diff --git a/packages/linux/linux-rp-2.6.21/defconfig-akita b/packages/linux/linux-rp-2.6.21/defconfig-akita index 748ab41d22..cc4cc782db 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-akita +++ b/packages/linux/linux-rp-2.6.21/defconfig-akita @@ -1656,6 +1656,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DETECT_SOFTLOCKUP is not set # CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-c7x0 b/packages/linux/linux-rp-2.6.21/defconfig-c7x0 index e8efdd4de2..1ff275cee5 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.21/defconfig-c7x0 @@ -1698,6 +1698,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_TIMER_STATS=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-hx2000 b/packages/linux/linux-rp-2.6.21/defconfig-hx2000 index 2a67a2d045..b962caa27c 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.21/defconfig-hx2000 @@ -1080,6 +1080,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_TIMER_STATS=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_DEBUG_PREEMPT=y diff --git a/packages/linux/linux-rp-2.6.21/defconfig-poodle b/packages/linux/linux-rp-2.6.21/defconfig-poodle index 13616c08f1..fa7b83df77 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.21/defconfig-poodle @@ -1585,6 +1585,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_TIMER_STATS=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-qemuarm b/packages/linux/linux-rp-2.6.21/defconfig-qemuarm index f70b6db7c7..35cf3f5b17 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.21/defconfig-qemuarm @@ -1147,6 +1147,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_TIMER_STATS=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_MUTEXES is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-qemux86 b/packages/linux/linux-rp-2.6.21/defconfig-qemux86 index 08e0a0c6c7..0d26596d78 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.21/defconfig-qemux86 @@ -1533,6 +1533,7 @@ CONFIG_STACK_BACKTRACE_COLS=2 CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y CONFIG_DOUBLEFAULT=y +CONFIG_TIMER_STATS=y # # Security options diff --git a/packages/linux/linux-rp-2.6.21/defconfig-spitz b/packages/linux/linux-rp-2.6.21/defconfig-spitz index e1c2c10352..ce9b90066b 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.21/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Wed Jun 13 15:37:54 2007 +# Sat Jun 30 20:16:08 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1014,6 +1014,46 @@ CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set + +# +# V4L USB devices +# +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set +# CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_ZC0301 is not set +# CONFIG_USB_PWC is not set + +# +# Radio Adapters +# +# CONFIG_USB_DSBR is not set + # # Digital Video Broadcasting Devices # @@ -1649,7 +1689,7 @@ CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DETECT_SOFTLOCKUP is not set # CONFIG_SCHEDSTATS is not set -# CONFIG_TIMER_STATS is not set +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -1738,4 +1778,4 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -CONFIG_SHARPSL_RC=m +CONFIG_SHARPSL_RC=m \ No newline at end of file diff --git a/packages/linux/linux-rp-2.6.21/defconfig-tosa b/packages/linux/linux-rp-2.6.21/defconfig-tosa index 4360f7a179..392acf47e9 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.21/defconfig-tosa @@ -1541,6 +1541,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_TIMER_STATS=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set -- cgit v1.2.3