From 01cabcc3fd22e25937dbe24ee14cdf464a1ec97e Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 4 Jan 2006 12:01:04 +0000
Subject: nslu2-kernel: Added the scsi-idle patch, Enabled CONFIG_INPUT=y,
 cause Debian tools (especially yaird) assume that /proc/bus/input exists,
 Updated patchsets to match 2.6.15, removed some patches, and combined some
 others, Updated to class-based RTC driver from azummo, changed defconfig to
 remove the pwc module, memory-h-page-shift page revised due to feedback from
 RMK, Removed old kernel versions, Updated to 2.6.15 final.

---
 packages/linux/nslu2-kernel/2.6.15/defconfig | 29 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'packages/linux/nslu2-kernel/2.6.15/defconfig')

diff --git a/packages/linux/nslu2-kernel/2.6.15/defconfig b/packages/linux/nslu2-kernel/2.6.15/defconfig
index 7074421cd7..883230ce19 100644
--- a/packages/linux/nslu2-kernel/2.6.15/defconfig
+++ b/packages/linux/nslu2-kernel/2.6.15/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.15
-# Mon Nov 28 13:10:38 2005
+# Mon Nov 14 10:44:43 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -177,7 +177,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc x1205.hctosys=1 noirqdebug console=ttyS0,115200n8"
+CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f noirqdebug console=ttyS0,115200n8"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -410,11 +410,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=m
 
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-# CONFIG_CONNECTOR is not set
-
 #
 # Memory Technology Devices (MTD)
 #
@@ -797,7 +792,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 # Input device support
 #
-CONFIG_INPUT=m
+CONFIG_INPUT=y
 
 #
 # Userland interfaces
@@ -878,7 +873,7 @@ CONFIG_IXP4XX_WATCHDOG=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-CONFIG_RTC_X1205=y
+CONFIG_RTC_X1205=n
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -946,7 +941,7 @@ CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
 # CONFIG_SENSORS_MAX6875 is not set
-CONFIG_RTC_X1205_I2C=y
+# CONFIG_RTC_X1205_I2C is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1035,8 +1030,6 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
 # CONFIG_VIDEO_EM28XX is not set
 CONFIG_VIDEO_OVCAMCHIP=m
-# CONFIG_VIDEO_AUDIO_DECODER is not set
-# CONFIG_VIDEO_DECODER is not set
 
 #
 # Radio Adapters
@@ -1281,7 +1274,6 @@ CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
-# CONFIG_USB_SERIAL_ANYDATA is not set
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1301,6 +1293,7 @@ CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
 CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_SERIAL_HP4X is not set
 CONFIG_USB_SERIAL_SAFE=m
@@ -1594,3 +1587,13 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+
+CONFIG_RTC_CLASS=y
+# RTC interfaces
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# RTC drivers
+CONFIG_RTC_DRV_X1205=y
+CONFIG_RTC_DRV_DS1672=n
+CONFIG_RTC_DRV_TEST=n
-- 
cgit v1.2.3