cvs diff: Diffing 2.6.15
Index: 2.6.15/94-loft-setup.patch
===================================================================
RCS file: /cvsroot/nslu/kernel/2.6.15/Attic/94-loft-setup.patch,v
retrieving revision 1.1
diff -r1.1 94-loft-setup.patch
43c43
< +
---
> + return ;
Index: 2.6.15/defconfig
===================================================================
RCS file: /cvsroot/nslu/kernel/2.6.15/defconfig,v
retrieving revision 1.13
diff -r1.13 defconfig
4c4
< # Fri Jan 13 23:40:57 2006
---
> # Thu Jan 19 19:34:19 2006
17a18
> CONFIG_LOCK_KERNEL=y
27c28
< # CONFIG_POSIX_MQUEUE is not set
---
> CONFIG_POSIX_MQUEUE=y
32,33c33,35
< CONFIG_KOBJECT_UEVENT=y
< # CONFIG_IKCONFIG is not set
---
> # CONFIG_KOBJECT_UEVENT is not set
> CONFIG_IKCONFIG=y
> CONFIG_IKCONFIG_PROC=y
37c39,40
< # CONFIG_KALLSYMS is not set
---
> CONFIG_KALLSYMS=y
> # CONFIG_KALLSYMS_EXTRA_PASS is not set
40c43
< # CONFIG_BASE_FULL is not set
---
> CONFIG_BASE_FULL=y
49c52
< CONFIG_BASE_SMALL=1
---
> CONFIG_BASE_SMALL=0
56c59
< # CONFIG_MODULE_FORCE_UNLOAD is not set
---
> CONFIG_MODULE_FORCE_UNLOAD=y
70c73
< # CONFIG_IOSCHED_AS is not set
---
> CONFIG_IOSCHED_AS=y
72,74c75,77
< # CONFIG_IOSCHED_CFQ is not set
< # CONFIG_DEFAULT_AS is not set
< CONFIG_DEFAULT_DEADLINE=y
---
> CONFIG_IOSCHED_CFQ=y
> CONFIG_DEFAULT_AS=y
> # CONFIG_DEFAULT_DEADLINE is not set
77c80
< CONFIG_DEFAULT_IOSCHED="deadline"
---
> CONFIG_DEFAULT_IOSCHED="anticipatory"
123c126
< CONFIG_MACH_NAS100D=y
---
> # CONFIG_MACH_NAS100D is not set
146c149
< CONFIG_CPU_BIG_ENDIAN=y
---
> # CONFIG_CPU_BIG_ENDIAN is not set
165c168
< # CONFIG_PREEMPT is not set
---
> CONFIG_PREEMPT=y
183c186,187
< CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 pcf8563.hctosys=1 noirqdebug console=ttyS0,115200n8"
---
> #CONFIG_CMDLINE="console=ttyS0,115200,8n root=/dev/sda7 rootfstype=ext3 rootdelay=12 noirqdebug rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 mem=64M@0x0"
> CONFIG_CMDLINE="console=ttyS0,115200,8n root=/dev/sda6 rootfstype=ext3 rootdelay=12 noirqdebug rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 mem=64M@0x0"
202c206
< # CONFIG_BINFMT_MISC is not set
---
> CONFIG_BINFMT_MISC=y
218c222
< CONFIG_PACKET=m
---
> CONFIG_PACKET=y
221,222d224
< CONFIG_XFRM=y
< # CONFIG_XFRM_USER is not set
226c228,230
< # CONFIG_IP_ADVANCED_ROUTER is not set
---
> CONFIG_IP_ADVANCED_ROUTER=y
> CONFIG_ASK_IP_FIB_HASH=y
> # CONFIG_IP_FIB_TRIE is not set
228,230c232,240
< # CONFIG_IP_PNP is not set
< # CONFIG_NET_IPIP is not set
< # CONFIG_NET_IPGRE is not set
---
> # CONFIG_IP_MULTIPLE_TABLES is not set
> # CONFIG_IP_ROUTE_MULTIPATH is not set
> # CONFIG_IP_ROUTE_VERBOSE is not set
> CONFIG_IP_PNP=y
> # CONFIG_IP_PNP_DHCP is not set
> # CONFIG_IP_PNP_BOOTP is not set
> # CONFIG_IP_PNP_RARP is not set
> CONFIG_NET_IPIP=m
> CONFIG_NET_IPGRE=m
232,238c242,247
< # CONFIG_SYN_COOKIES is not set
< CONFIG_INET_AH=m
< CONFIG_INET_ESP=m
< CONFIG_INET_IPCOMP=m
< CONFIG_INET_TUNNEL=m
< CONFIG_INET_DIAG=y
< CONFIG_INET_TCP_DIAG=y
---
> CONFIG_SYN_COOKIES=y
> # CONFIG_INET_AH is not set
> # CONFIG_INET_ESP is not set
> # CONFIG_INET_IPCOMP is not set
> # CONFIG_INET_TUNNEL is not set
> # CONFIG_INET_DIAG is not set
246,252c255
< CONFIG_IPV6=m
< # CONFIG_IPV6_PRIVACY is not set
< CONFIG_INET6_AH=m
< CONFIG_INET6_ESP=m
< CONFIG_INET6_IPCOMP=m
< CONFIG_INET6_TUNNEL=m
< CONFIG_IPV6_TUNNEL=m
---
> # CONFIG_IPV6 is not set
266,267c269,270
< # CONFIG_IP_NF_CT_ACCT is not set
< # CONFIG_IP_NF_CONNTRACK_MARK is not set
---
> CONFIG_IP_NF_CT_ACCT=y
> CONFIG_IP_NF_CONNTRACK_MARK=y
299c302
< # CONFIG_IP_NF_MATCH_SCTP is not set
---
> CONFIG_IP_NF_MATCH_SCTP=m
301a305,306
> CONFIG_IP_NF_MATCH_CONNMARK=m
> # CONFIG_IP_NF_MATCH_CONNBYTES is not set
305c310
< # CONFIG_IP_NF_TARGET_REJECT is not set
---
> CONFIG_IP_NF_TARGET_REJECT=m
328,335c333,339
< # CONFIG_IP_NF_RAW is not set
< # CONFIG_IP_NF_ARPTABLES is not set
<
< #
< # IPv6: Netfilter Configuration (EXPERIMENTAL)
< #
< # CONFIG_IP6_NF_QUEUE is not set
< # CONFIG_IP6_NF_IPTABLES is not set
---
> CONFIG_IP_NF_TARGET_CONNMARK=m
> CONFIG_IP_NF_TARGET_CLUSTERIP=m
> CONFIG_IP_NF_RAW=m
> CONFIG_IP_NF_TARGET_NOTRACK=m
> CONFIG_IP_NF_ARPTABLES=m
> CONFIG_IP_NF_ARPFILTER=m
> CONFIG_IP_NF_ARP_MANGLE=m
340c344,363
< # CONFIG_BRIDGE_NF_EBTABLES is not set
---
> CONFIG_BRIDGE_NF_EBTABLES=m
> CONFIG_BRIDGE_EBT_BROUTE=m
> CONFIG_BRIDGE_EBT_T_FILTER=m
> CONFIG_BRIDGE_EBT_T_NAT=m
> CONFIG_BRIDGE_EBT_802_3=m
> CONFIG_BRIDGE_EBT_AMONG=m
> CONFIG_BRIDGE_EBT_ARP=m
> CONFIG_BRIDGE_EBT_IP=m
> CONFIG_BRIDGE_EBT_LIMIT=m
> CONFIG_BRIDGE_EBT_MARK=m
> CONFIG_BRIDGE_EBT_PKTTYPE=m
> CONFIG_BRIDGE_EBT_STP=m
> CONFIG_BRIDGE_EBT_VLAN=m
> CONFIG_BRIDGE_EBT_ARPREPLY=m
> CONFIG_BRIDGE_EBT_DNAT=m
> CONFIG_BRIDGE_EBT_MARK_T=m
> CONFIG_BRIDGE_EBT_REDIRECT=m
> CONFIG_BRIDGE_EBT_SNAT=m
> CONFIG_BRIDGE_EBT_LOG=m
> CONFIG_BRIDGE_EBT_ULOG=m
355d377
< CONFIG_LLC=m
357,363c379,380
< CONFIG_IPX=m
< # CONFIG_IPX_INTERN is not set
< CONFIG_ATALK=m
< CONFIG_DEV_APPLETALK=y
< CONFIG_IPDDP=m
< CONFIG_IPDDP_ENCAP=y
< CONFIG_IPDDP_DECAP=y
---
> # CONFIG_IPX is not set
> # CONFIG_ATALK is not set
373c390,417
< # CONFIG_NET_SCHED is not set
---
> CONFIG_NET_SCHED=y
> CONFIG_NET_SCH_CLK_JIFFIES=y
> # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
> # CONFIG_NET_SCH_CLK_CPU is not set
>
> #
> # Queueing/Scheduling
> #
> CONFIG_NET_SCH_CBQ=m
> CONFIG_NET_SCH_HTB=m
> CONFIG_NET_SCH_HFSC=m
> CONFIG_NET_SCH_PRIO=m
> CONFIG_NET_SCH_RED=m
> CONFIG_NET_SCH_SFQ=m
> CONFIG_NET_SCH_TEQL=m
> CONFIG_NET_SCH_TBF=m
> CONFIG_NET_SCH_GRED=m
> CONFIG_NET_SCH_DSMARK=m
> CONFIG_NET_SCH_NETEM=m
> CONFIG_NET_SCH_INGRESS=m
>
> #
> # Classification
> #
> CONFIG_NET_CLS=y
> CONFIG_NET_CLS_BASIC=m
> CONFIG_NET_CLS_TCINDEX=m
> CONFIG_NET_CLS_ROUTE4=m
374a419,441
> CONFIG_NET_CLS_FW=m
> CONFIG_NET_CLS_U32=m
> # CONFIG_CLS_U32_PERF is not set
> # CONFIG_CLS_U32_MARK is not set
> CONFIG_NET_CLS_RSVP=m
> CONFIG_NET_CLS_RSVP6=m
> CONFIG_NET_EMATCH=y
> CONFIG_NET_EMATCH_STACK=32
> CONFIG_NET_EMATCH_CMP=m
> CONFIG_NET_EMATCH_NBYTE=m
> CONFIG_NET_EMATCH_U32=m
> CONFIG_NET_EMATCH_META=m
> CONFIG_NET_EMATCH_TEXT=m
> CONFIG_NET_CLS_ACT=y
> CONFIG_NET_ACT_POLICE=m
> CONFIG_NET_ACT_GACT=m
> CONFIG_GACT_PROB=y
> CONFIG_NET_ACT_MIRRED=m
> # CONFIG_NET_ACT_IPT is not set
> CONFIG_NET_ACT_PEDIT=m
> CONFIG_NET_ACT_SIMP=m
> # CONFIG_NET_CLS_IND is not set
> CONFIG_NET_ESTIMATOR=y
379c446
< CONFIG_NET_PKTGEN=m
---
> # CONFIG_NET_PKTGEN is not set
383,390c450,451
< CONFIG_BT_L2CAP=m
< CONFIG_BT_SCO=m
< CONFIG_BT_RFCOMM=m
< CONFIG_BT_RFCOMM_TTY=y
< CONFIG_BT_BNEP=m
< CONFIG_BT_BNEP_MC_FILTER=y
< CONFIG_BT_BNEP_PROTO_FILTER=y
< # CONFIG_BT_HIDP is not set
---
> # CONFIG_BT_L2CAP is not set
> # CONFIG_BT_SCO is not set
395,396c456
< CONFIG_BT_HCIUSB=m
< CONFIG_BT_HCIUSB_SCO=y
---
> # CONFIG_BT_HCIUSB is not set
398c458
< CONFIG_BT_HCIBCM203X=m
---
> # CONFIG_BT_HCIBCM203X is not set
402c462,466
< # CONFIG_IEEE80211 is not set
---
> CONFIG_IEEE80211=y
> # CONFIG_IEEE80211_DEBUG is not set
> CONFIG_IEEE80211_CRYPT_WEP=y
> # CONFIG_IEEE80211_CRYPT_CCMP is not set
> # CONFIG_IEEE80211_CRYPT_TKIP is not set
413c477
< CONFIG_FW_LOADER=m
---
> CONFIG_FW_LOADER=y
429c493
< # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
---
> CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
454,455c518,519
< CONFIG_MTD_CFI_GEOMETRY=y
< # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
---
> # CONFIG_MTD_CFI_GEOMETRY is not set
> CONFIG_MTD_MAP_BANK_WIDTH_1=y
457c521
< # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
---
> CONFIG_MTD_MAP_BANK_WIDTH_4=y
465c529
< # CONFIG_MTD_OTP is not set
---
> CONFIG_MTD_OTP=y
535,540c599,602
< CONFIG_BLK_DEV_RAM_COUNT=4
< CONFIG_BLK_DEV_RAM_SIZE=10240
< CONFIG_BLK_DEV_INITRD=y
< CONFIG_CDROM_PKTCDVD=m
< CONFIG_CDROM_PKTCDVD_BUFFERS=8
< # CONFIG_CDROM_PKTCDVD_WCACHE is not set
---
> CONFIG_BLK_DEV_RAM_COUNT=2
> CONFIG_BLK_DEV_RAM_SIZE=8192
> # CONFIG_BLK_DEV_INITRD is not set
> # CONFIG_CDROM_PKTCDVD is not set
546c608,632
< # CONFIG_IDE is not set
---
> CONFIG_IDE=y
> CONFIG_BLK_DEV_IDE=y
>
> #
> # Please see Documentation/ide.txt for help/info on IDE drives
> #
> # CONFIG_BLK_DEV_IDE_SATA is not set
> CONFIG_BLK_DEV_IDEDISK=y
> # CONFIG_IDEDISK_MULTI_MODE is not set
> # CONFIG_BLK_DEV_IDECD is not set
> # CONFIG_BLK_DEV_IDETAPE is not set
> # CONFIG_BLK_DEV_IDEFLOPPY is not set
> # CONFIG_BLK_DEV_IDESCSI is not set
> # CONFIG_IDE_TASK_IOCTL is not set
>
> #
> # IDE chipset support/bugfixes
> #
> CONFIG_IDE_GENERIC=y
> # CONFIG_BLK_DEV_IDEPCI is not set
> # CONFIG_IDE_ARM is not set
> CONFIG_BLK_DEV_IDE_AVILA=y
> # CONFIG_BLK_DEV_IDEDMA is not set
> # CONFIG_IDEDMA_AUTO is not set
> # CONFIG_BLK_DEV_HD is not set
561,563c647,648
< CONFIG_BLK_DEV_SR=m
< # CONFIG_BLK_DEV_SR_VENDOR is not set
< CONFIG_CHR_DEV_SG=m
---
> # CONFIG_BLK_DEV_SR is not set
> # CONFIG_CHR_DEV_SG is not set
569c654
< CONFIG_SCSI_MULTI_LUN=y
---
> # CONFIG_SCSI_MULTI_LUN is not set
625,640c710
< CONFIG_MD=y
< CONFIG_BLK_DEV_MD=m
< CONFIG_MD_LINEAR=m
< CONFIG_MD_RAID0=m
< CONFIG_MD_RAID1=m
< CONFIG_MD_RAID10=m
< CONFIG_MD_RAID5=m
< CONFIG_MD_RAID6=m
< CONFIG_MD_MULTIPATH=m
< CONFIG_MD_FAULTY=m
< CONFIG_BLK_DEV_DM=m
< # CONFIG_DM_CRYPT is not set
< # CONFIG_DM_SNAPSHOT is not set
< # CONFIG_DM_MIRROR is not set
< # CONFIG_DM_ZERO is not set
< # CONFIG_DM_MULTIPATH is not set
---
> # CONFIG_MD is not set
705c775
< # CONFIG_E100 is not set
---
> CONFIG_E100=m
758a829,831
> # CONFIG_IPW2100 is not set
> # CONFIG_IPW_DEBUG is not set
> CONFIG_IPW2200=m
767c840,843
< # CONFIG_HOSTAP is not set
---
> CONFIG_HOSTAP=y
> # CONFIG_HOSTAP_FIRMWARE is not set
> # CONFIG_HOSTAP_PLX is not set
> # CONFIG_HOSTAP_PCI is not set
777c853
< # CONFIG_PPP_MULTILINK is not set
---
> CONFIG_PPP_MULTILINK=y
780c856
< # CONFIG_PPP_SYNC_TTY is not set
---
> CONFIG_PPP_SYNC_TTY=m
784c860
< # CONFIG_PPPOE is not set
---
> CONFIG_PPPOE=m
787,792c863,866
< # CONFIG_SHAPER is not set
< CONFIG_NETCONSOLE=m
< CONFIG_NETPOLL=y
< # CONFIG_NETPOLL_RX is not set
< # CONFIG_NETPOLL_TRAP is not set
< CONFIG_NET_POLL_CONTROLLER=y
---
> CONFIG_SHAPER=m
> # CONFIG_NETCONSOLE is not set
> # CONFIG_NETPOLL is not set
> # CONFIG_NET_POLL_CONTROLLER is not set
802,822c876
< CONFIG_INPUT=y
<
< #
< # Userland interfaces
< #
< # CONFIG_INPUT_MOUSEDEV is not set
< # CONFIG_INPUT_JOYDEV is not set
< # CONFIG_INPUT_TSDEV is not set
< CONFIG_INPUT_EVDEV=m
< # CONFIG_INPUT_EVBUG is not set
<
< #
< # Input Device Drivers
< #
< # CONFIG_INPUT_KEYBOARD is not set
< # CONFIG_INPUT_MOUSE is not set
< # CONFIG_INPUT_JOYSTICK is not set
< # CONFIG_INPUT_TOUCHSCREEN is not set
< CONFIG_INPUT_MISC=y
< CONFIG_INPUT_NSLU2_BEEPER=m
< # CONFIG_INPUT_UINPUT is not set
---
> # CONFIG_INPUT is not set
852c906
< CONFIG_LEGACY_PTY_COUNT=16
---
> CONFIG_LEGACY_PTY_COUNT=256
881,883c935,936
< # CONFIG_NVRAM is not set
< # CONFIG_RTC is not set
< CONFIG_RTC_PCF8563=y
---
> CONFIG_NVRAM=m
> CONFIG_RTC=y
952c1005
< CONFIG_RTC_PCF8563_I2C=y
---
> # CONFIG_RTC_PCF8563_I2C is not set
961c1014
< CONFIG_HWMON=y
---
> CONFIG_HWMON=m
1010,1050c1063
< CONFIG_VIDEO_DEV=m
<
< #
< # Video For Linux
< #
<
< #
< # Video Adapters
< #
< CONFIG_VIDEO_BT848=m
< # CONFIG_VIDEO_SAA6588 is not set
< CONFIG_VIDEO_CPIA=m
< CONFIG_VIDEO_CPIA_USB=m
< CONFIG_VIDEO_SAA5246A=m
< CONFIG_VIDEO_SAA5249=m
< CONFIG_TUNER_3036=m
< CONFIG_VIDEO_STRADIS=m
< CONFIG_VIDEO_ZORAN=m
< CONFIG_VIDEO_ZORAN_BUZ=m
< CONFIG_VIDEO_ZORAN_DC10=m
< CONFIG_VIDEO_ZORAN_DC30=m
< CONFIG_VIDEO_ZORAN_LML33=m
< CONFIG_VIDEO_ZORAN_LML33R10=m
< CONFIG_VIDEO_SAA7134=m
< # CONFIG_VIDEO_SAA7134_ALSA is not set
< CONFIG_VIDEO_MXB=m
< CONFIG_VIDEO_DPC=m
< CONFIG_VIDEO_HEXIUM_ORION=m
< 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
< #
< # CONFIG_RADIO_GEMTEK_PCI is not set
< # CONFIG_RADIO_MAXIRADIO is not set
< # CONFIG_RADIO_MAESTRO is not set
---
> # CONFIG_VIDEO_DEV is not set
1056,1063d1068
< CONFIG_VIDEO_SAA7146=m
< CONFIG_VIDEO_SAA7146_VV=m
< CONFIG_VIDEO_VIDEOBUF=m
< CONFIG_VIDEO_TUNER=m
< CONFIG_VIDEO_BUF=m
< CONFIG_VIDEO_BTCX=m
< CONFIG_VIDEO_IR=m
< CONFIG_VIDEO_TVEEPROM=m
1073,1155c1078
< CONFIG_SOUND=m
<
< #
< # Advanced Linux Sound Architecture
< #
< CONFIG_SND=m
< CONFIG_SND_TIMER=m
< CONFIG_SND_PCM=m
< CONFIG_SND_HWDEP=m
< CONFIG_SND_RAWMIDI=m
< # CONFIG_SND_SEQUENCER is not set
< CONFIG_SND_OSSEMUL=y
< CONFIG_SND_MIXER_OSS=m
< CONFIG_SND_PCM_OSS=m
< # CONFIG_SND_VERBOSE_PRINTK is not set
< # CONFIG_SND_DEBUG is not set
<
< #
< # Generic devices
< #
< # CONFIG_SND_DUMMY is not set
< # CONFIG_SND_MTPAV is not set
< # CONFIG_SND_SERIAL_U16550 is not set
< # CONFIG_SND_MPU401 is not set
<
< #
< # PCI devices
< #
< # CONFIG_SND_ALI5451 is not set
< # CONFIG_SND_ATIIXP is not set
< # CONFIG_SND_ATIIXP_MODEM is not set
< # CONFIG_SND_AU8810 is not set
< # CONFIG_SND_AU8820 is not set
< # CONFIG_SND_AU8830 is not set
< # CONFIG_SND_AZT3328 is not set
< # CONFIG_SND_BT87X is not set
< # CONFIG_SND_CS46XX is not set
< # CONFIG_SND_CS4281 is not set
< # CONFIG_SND_EMU10K1 is not set
< # CONFIG_SND_EMU10K1X is not set
< # CONFIG_SND_CA0106 is not set
< # CONFIG_SND_KORG1212 is not set
< # CONFIG_SND_MIXART is not set
< # CONFIG_SND_NM256 is not set
< # CONFIG_SND_RME32 is not set
< # CONFIG_SND_RME96 is not set
< # CONFIG_SND_RME9652 is not set
< # CONFIG_SND_HDSP is not set
< # CONFIG_SND_HDSPM is not set
< # CONFIG_SND_TRIDENT is not set
< # CONFIG_SND_YMFPCI is not set
< # CONFIG_SND_AD1889 is not set
< # CONFIG_SND_ALS4000 is not set
< # CONFIG_SND_CMIPCI is not set
< # CONFIG_SND_ENS1370 is not set
< # CONFIG_SND_ENS1371 is not set
< # CONFIG_SND_ES1938 is not set
< # CONFIG_SND_ES1968 is not set
< # CONFIG_SND_MAESTRO3 is not set
< # CONFIG_SND_FM801 is not set
< # CONFIG_SND_ICE1712 is not set
< # CONFIG_SND_ICE1724 is not set
< # CONFIG_SND_INTEL8X0 is not set
< # CONFIG_SND_INTEL8X0M is not set
< # CONFIG_SND_SONICVIBES is not set
< # CONFIG_SND_VIA82XX is not set
< # CONFIG_SND_VIA82XX_MODEM is not set
< # CONFIG_SND_VX222 is not set
< # CONFIG_SND_HDA_INTEL is not set
<
< #
< # ALSA ARM devices
< #
<
< #
< # USB devices
< #
< CONFIG_SND_USB_AUDIO=m
<
< #
< # Open Sound System
< #
< # CONFIG_SOUND_PRIME is not set
---
> # CONFIG_SOUND is not set
1178c1101
< # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
---
> CONFIG_USB_EHCI_ROOT_HUB_TT=y
1189,1190c1112
< # CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
< CONFIG_USB_ACM=m
---
> # CONFIG_USB_ACM is not set
1203a1126
> # CONFIG_USB_STORAGE_ISD200 is not set
1206,1209c1129,1131
< # CONFIG_USB_STORAGE_SDDR09 is not set
< # CONFIG_USB_STORAGE_SDDR55 is not set
< # CONFIG_USB_STORAGE_JUMPSHOT is not set
< # CONFIG_USB_STORAGE_ONETOUCH is not set
---
> CONFIG_USB_STORAGE_SDDR09=y
> CONFIG_USB_STORAGE_SDDR55=y
> CONFIG_USB_STORAGE_JUMPSHOT=y
1214,1217c1136
< CONFIG_USB_HID=m
< CONFIG_USB_HIDINPUT=y
< # CONFIG_HID_FF is not set
< CONFIG_USB_HIDDEV=y
---
> # CONFIG_USB_HID is not set
1222,1236d1140
< CONFIG_USB_KBD=m
< # CONFIG_USB_MOUSE is not set
< # CONFIG_USB_AIPTEK is not set
< # CONFIG_USB_WACOM is not set
< # CONFIG_USB_ACECAD is not set
< # CONFIG_USB_KBTAB is not set
< # CONFIG_USB_POWERMATE is not set
< # CONFIG_USB_MTOUCH is not set
< # CONFIG_USB_ITMTOUCH is not set
< # CONFIG_USB_EGALAX is not set
< # CONFIG_USB_YEALINK is not set
< # CONFIG_USB_XPAD is not set
< # CONFIG_USB_ATI_REMOTE is not set
< # CONFIG_USB_KEYSPAN_REMOTE is not set
< # CONFIG_USB_APPLETOUCH is not set
1248,1257c1152,1155
< # CONFIG_USB_VICAM is not set
< # CONFIG_USB_DSBR is not set
< # CONFIG_USB_IBMCAM is not set
< # CONFIG_USB_KONICAWC 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_W9968CF is not set
< CONFIG_USB_PWC=m
---
>
> #
> # Video4Linux support is needed for USB Multimedia device support
> #
1262,1274c1160,1164
< CONFIG_USB_CATC=m
< CONFIG_USB_KAWETH=m
< CONFIG_USB_PEGASUS=m
< CONFIG_USB_RTL8150=m
< CONFIG_USB_USBNET=m
< CONFIG_USB_NET_AX8817X=m
< CONFIG_USB_NET_CDCETHER=m
< # CONFIG_USB_NET_GL620A is not set
< CONFIG_USB_NET_NET1080=m
< # CONFIG_USB_NET_PLUSB is not set
< # CONFIG_USB_NET_RNDIS_HOST is not set
< # CONFIG_USB_NET_CDC_SUBSET is not set
< CONFIG_USB_NET_ZAURUS=m
---
> # CONFIG_USB_CATC is not set
> # CONFIG_USB_KAWETH is not set
> # CONFIG_USB_PEGASUS is not set
> # CONFIG_USB_RTL8150 is not set
> # CONFIG_USB_USBNET is not set
1289,1291c1179,1181
< CONFIG_USB_SERIAL_BELKIN=m
< CONFIG_USB_SERIAL_WHITEHEAT=m
< CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
---
> # CONFIG_USB_SERIAL_BELKIN is not set
> # CONFIG_USB_SERIAL_WHITEHEAT is not set
> # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
1293,1303c1183,1193
< CONFIG_USB_SERIAL_CYPRESS_M8=m
< CONFIG_USB_SERIAL_EMPEG=m
< CONFIG_USB_SERIAL_FTDI_SIO=m
< CONFIG_USB_SERIAL_VISOR=m
< CONFIG_USB_SERIAL_IPAQ=m
< CONFIG_USB_SERIAL_IR=m
< CONFIG_USB_SERIAL_EDGEPORT=m
< CONFIG_USB_SERIAL_EDGEPORT_TI=m
< CONFIG_USB_SERIAL_GARMIN=m
< CONFIG_USB_SERIAL_IPW=m
< CONFIG_USB_SERIAL_KEYSPAN_PDA=m
---
> # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
> # CONFIG_USB_SERIAL_EMPEG is not set
> # CONFIG_USB_SERIAL_FTDI_SIO is not set
> # CONFIG_USB_SERIAL_VISOR is not set
> # CONFIG_USB_SERIAL_IPAQ is not set
> # CONFIG_USB_SERIAL_IR is not set
> # CONFIG_USB_SERIAL_EDGEPORT is not set
> # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
> # CONFIG_USB_SERIAL_GARMIN is not set
> # CONFIG_USB_SERIAL_IPW is not set
> # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
1305,1307c1195,1197
< CONFIG_USB_SERIAL_KLSI=m
< CONFIG_USB_SERIAL_KOBIL_SCT=m
< CONFIG_USB_SERIAL_MCT_U232=m
---
> # CONFIG_USB_SERIAL_KLSI is not set
> # CONFIG_USB_SERIAL_KOBIL_SCT is not set
> # CONFIG_USB_SERIAL_MCT_U232 is not set
1310,1316c1200,1204
< CONFIG_USB_SERIAL_SAFE=m
< # CONFIG_USB_SERIAL_SAFE_PADDED is not set
< CONFIG_USB_SERIAL_TI=m
< CONFIG_USB_SERIAL_CYBERJACK=m
< CONFIG_USB_SERIAL_XIRCOM=m
< CONFIG_USB_SERIAL_OMNINET=m
< CONFIG_USB_EZUSB=y
---
> # CONFIG_USB_SERIAL_SAFE is not set
> # CONFIG_USB_SERIAL_TI is not set
> # CONFIG_USB_SERIAL_CYBERJACK is not set
> # CONFIG_USB_SERIAL_XIRCOM is not set
> # CONFIG_USB_SERIAL_OMNINET is not set
1372,1375c1260,1261
< CONFIG_EXT2_FS=m
< CONFIG_EXT2_FS_XATTR=y
< CONFIG_EXT2_FS_POSIX_ACL=y
< CONFIG_EXT2_FS_SECURITY=y
---
> CONFIG_EXT2_FS=y
> # CONFIG_EXT2_FS_XATTR is not set
1377c1263
< CONFIG_EXT3_FS=m
---
> CONFIG_EXT3_FS=y
1379,1389c1265,1270
< CONFIG_EXT3_FS_POSIX_ACL=y
< CONFIG_EXT3_FS_SECURITY=y
< CONFIG_JBD=m
< # CONFIG_JBD_DEBUG is not set
< CONFIG_FS_MBCACHE=m
< CONFIG_REISERFS_FS=m
< # CONFIG_REISERFS_CHECK is not set
< # CONFIG_REISERFS_PROC_INFO is not set
< CONFIG_REISERFS_FS_XATTR=y
< CONFIG_REISERFS_FS_POSIX_ACL=y
< CONFIG_REISERFS_FS_SECURITY=y
---
> # CONFIG_EXT3_FS_POSIX_ACL is not set
> # CONFIG_EXT3_FS_SECURITY is not set
> CONFIG_JBD=y
> CONFIG_JBD_DEBUG=y
> CONFIG_FS_MBCACHE=y
> # CONFIG_REISERFS_FS is not set
1395c1276
< CONFIG_INOTIFY=y
---
> # CONFIG_INOTIFY is not set
1397c1278
< CONFIG_DNOTIFY=y
---
> # CONFIG_DNOTIFY is not set
1399c1280
< CONFIG_AUTOFS4_FS=m
---
> # CONFIG_AUTOFS4_FS is not set
1405,1410c1286,1287
< CONFIG_ISO9660_FS=m
< CONFIG_JOLIET=y
< CONFIG_ZISOFS=y
< CONFIG_ZISOFS_FS=m
< CONFIG_UDF_FS=m
< CONFIG_UDF_NLS=y
---
> # CONFIG_ISO9660_FS is not set
> # CONFIG_UDF_FS is not set
1415,1422c1292,1294
< CONFIG_FAT_FS=m
< CONFIG_MSDOS_FS=m
< CONFIG_VFAT_FS=m
< CONFIG_FAT_DEFAULT_CODEPAGE=437
< CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
< CONFIG_NTFS_FS=m
< # CONFIG_NTFS_DEBUG is not set
< CONFIG_NTFS_RW=y
---
> # CONFIG_MSDOS_FS is not set
> # CONFIG_VFAT_FS is not set
> # CONFIG_NTFS_FS is not set
1466c1338
< CONFIG_NFS_FS=m
---
> CONFIG_NFS_FS=y
1468c1340
< # CONFIG_NFS_V3_ACL is not set
---
> CONFIG_NFS_V3_ACL=y
1470,1476c1342,1345
< CONFIG_NFS_DIRECTIO=y
< CONFIG_NFSD=m
< CONFIG_NFSD_V3=y
< # CONFIG_NFSD_V3_ACL is not set
< CONFIG_NFSD_V4=y
< CONFIG_NFSD_TCP=y
< CONFIG_LOCKD=m
---
> # CONFIG_NFS_DIRECTIO is not set
> # CONFIG_NFSD is not set
> CONFIG_ROOT_NFS=y
> CONFIG_LOCKD=y
1478c1347
< CONFIG_EXPORTFS=m
---
> CONFIG_NFS_ACL_SUPPORT=y
1480,1482c1349,1351
< CONFIG_SUNRPC=m
< CONFIG_SUNRPC_GSS=m
< CONFIG_RPCSEC_GSS_KRB5=m
---
> CONFIG_SUNRPC=y
> CONFIG_SUNRPC_GSS=y
> CONFIG_RPCSEC_GSS_KRB5=y
1484,1490c1353,1356
< CONFIG_SMB_FS=m
< # CONFIG_SMB_NLS_DEFAULT is not set
< CONFIG_CIFS=m
< # CONFIG_CIFS_STATS is not set
< CONFIG_CIFS_XATTR=y
< CONFIG_CIFS_POSIX=y
< # CONFIG_CIFS_EXPERIMENTAL is not set
---
> CONFIG_SMB_FS=y
> CONFIG_SMB_NLS_DEFAULT=y
> CONFIG_SMB_NLS_REMOTE="cp437"
> # CONFIG_CIFS is not set
1499,1504c1365
< CONFIG_PARTITION_ADVANCED=y
< # CONFIG_ACORN_PARTITION is not set
< # CONFIG_OSF_PARTITION is not set
< # CONFIG_AMIGA_PARTITION is not set
< # CONFIG_ATARI_PARTITION is not set
< # CONFIG_MAC_PARTITION is not set
---
> # CONFIG_PARTITION_ADVANCED is not set
1506,1514d1366
< # CONFIG_BSD_DISKLABEL is not set
< # CONFIG_MINIX_SUBPARTITION is not set
< # CONFIG_SOLARIS_X86_PARTITION is not set
< # CONFIG_UNIXWARE_DISKLABEL is not set
< # CONFIG_LDM_PARTITION is not set
< # CONFIG_SGI_PARTITION is not set
< # CONFIG_ULTRIX_PARTITION is not set
< # CONFIG_SUN_PARTITION is not set
< # CONFIG_EFI_PARTITION is not set
1519,1558c1371,1410
< CONFIG_NLS=m
< CONFIG_NLS_DEFAULT="utf8"
< CONFIG_NLS_CODEPAGE_437=m
< CONFIG_NLS_CODEPAGE_737=m
< CONFIG_NLS_CODEPAGE_775=m
< CONFIG_NLS_CODEPAGE_850=m
< CONFIG_NLS_CODEPAGE_852=m
< CONFIG_NLS_CODEPAGE_855=m
< CONFIG_NLS_CODEPAGE_857=m
< CONFIG_NLS_CODEPAGE_860=m
< CONFIG_NLS_CODEPAGE_861=m
< CONFIG_NLS_CODEPAGE_862=m
< CONFIG_NLS_CODEPAGE_863=m
< CONFIG_NLS_CODEPAGE_864=m
< CONFIG_NLS_CODEPAGE_865=m
< CONFIG_NLS_CODEPAGE_866=m
< CONFIG_NLS_CODEPAGE_869=m
< CONFIG_NLS_CODEPAGE_936=m
< CONFIG_NLS_CODEPAGE_950=m
< CONFIG_NLS_CODEPAGE_932=m
< CONFIG_NLS_CODEPAGE_949=m
< CONFIG_NLS_CODEPAGE_874=m
< CONFIG_NLS_ISO8859_8=m
< CONFIG_NLS_CODEPAGE_1250=m
< CONFIG_NLS_CODEPAGE_1251=m
< CONFIG_NLS_ASCII=m
< CONFIG_NLS_ISO8859_1=m
< CONFIG_NLS_ISO8859_2=m
< CONFIG_NLS_ISO8859_3=m
< CONFIG_NLS_ISO8859_4=m
< CONFIG_NLS_ISO8859_5=m
< CONFIG_NLS_ISO8859_6=m
< CONFIG_NLS_ISO8859_7=m
< CONFIG_NLS_ISO8859_9=m
< CONFIG_NLS_ISO8859_13=m
< CONFIG_NLS_ISO8859_14=m
< CONFIG_NLS_ISO8859_15=m
< CONFIG_NLS_KOI8_R=m
< CONFIG_NLS_KOI8_U=m
< CONFIG_NLS_UTF8=m
---
> CONFIG_NLS=y
> CONFIG_NLS_DEFAULT="cp437"
> CONFIG_NLS_CODEPAGE_437=y
> # CONFIG_NLS_CODEPAGE_737 is not set
> # CONFIG_NLS_CODEPAGE_775 is not set
> # CONFIG_NLS_CODEPAGE_850 is not set
> # CONFIG_NLS_CODEPAGE_852 is not set
> # CONFIG_NLS_CODEPAGE_855 is not set
> # CONFIG_NLS_CODEPAGE_857 is not set
> # CONFIG_NLS_CODEPAGE_860 is not set
> # CONFIG_NLS_CODEPAGE_861 is not set
> # CONFIG_NLS_CODEPAGE_862 is not set
> # CONFIG_NLS_CODEPAGE_863 is not set
> # CONFIG_NLS_CODEPAGE_864 is not set
> # CONFIG_NLS_CODEPAGE_865 is not set
> # CONFIG_NLS_CODEPAGE_866 is not set
> # CONFIG_NLS_CODEPAGE_869 is not set
> # CONFIG_NLS_CODEPAGE_936 is not set
> # CONFIG_NLS_CODEPAGE_950 is not set
> # CONFIG_NLS_CODEPAGE_932 is not set
> # CONFIG_NLS_CODEPAGE_949 is not set
> # CONFIG_NLS_CODEPAGE_874 is not set
> # CONFIG_NLS_ISO8859_8 is not set
> # CONFIG_NLS_CODEPAGE_1250 is not set
> # CONFIG_NLS_CODEPAGE_1251 is not set
> # CONFIG_NLS_ASCII is not set
> # CONFIG_NLS_ISO8859_1 is not set
> # CONFIG_NLS_ISO8859_2 is not set
> # CONFIG_NLS_ISO8859_3 is not set
> # CONFIG_NLS_ISO8859_4 is not set
> # CONFIG_NLS_ISO8859_5 is not set
> # CONFIG_NLS_ISO8859_6 is not set
> # CONFIG_NLS_ISO8859_7 is not set
> # CONFIG_NLS_ISO8859_9 is not set
> # CONFIG_NLS_ISO8859_13 is not set
> # CONFIG_NLS_ISO8859_14 is not set
> # CONFIG_NLS_ISO8859_15 is not set
> # CONFIG_NLS_KOI8_R is not set
> # CONFIG_NLS_KOI8_U is not set
> # CONFIG_NLS_UTF8 is not set
1573c1425
< # CONFIG_DEBUG_USER is not set
---
> CONFIG_DEBUG_USER=y
1585c1437
< CONFIG_CRYPTO_HMAC=y
---
> # CONFIG_CRYPTO_HMAC is not set
1587c1439
< CONFIG_CRYPTO_MD4=m
---
> # CONFIG_CRYPTO_MD4 is not set
1589,1608c1441,1460
< CONFIG_CRYPTO_SHA1=m
< CONFIG_CRYPTO_SHA256=m
< CONFIG_CRYPTO_SHA512=m
< CONFIG_CRYPTO_WP512=m
< CONFIG_CRYPTO_TGR192=m
< CONFIG_CRYPTO_DES=m
< CONFIG_CRYPTO_BLOWFISH=m
< CONFIG_CRYPTO_TWOFISH=m
< CONFIG_CRYPTO_SERPENT=m
< CONFIG_CRYPTO_AES=m
< CONFIG_CRYPTO_CAST5=m
< CONFIG_CRYPTO_CAST6=m
< CONFIG_CRYPTO_TEA=m
< CONFIG_CRYPTO_ARC4=m
< CONFIG_CRYPTO_KHAZAD=m
< CONFIG_CRYPTO_ANUBIS=m
< CONFIG_CRYPTO_DEFLATE=m
< CONFIG_CRYPTO_MICHAEL_MIC=m
< CONFIG_CRYPTO_CRC32C=m
< CONFIG_CRYPTO_TEST=m
---
> # CONFIG_CRYPTO_SHA1 is not set
> # CONFIG_CRYPTO_SHA256 is not set
> # CONFIG_CRYPTO_SHA512 is not set
> # CONFIG_CRYPTO_WP512 is not set
> # CONFIG_CRYPTO_TGR192 is not set
> CONFIG_CRYPTO_DES=y
> # CONFIG_CRYPTO_BLOWFISH is not set
> # CONFIG_CRYPTO_TWOFISH is not set
> # CONFIG_CRYPTO_SERPENT is not set
> # CONFIG_CRYPTO_AES is not set
> # CONFIG_CRYPTO_CAST5 is not set
> # CONFIG_CRYPTO_CAST6 is not set
> # CONFIG_CRYPTO_TEA is not set
> CONFIG_CRYPTO_ARC4=y
> # CONFIG_CRYPTO_KHAZAD is not set
> # CONFIG_CRYPTO_ANUBIS is not set
> # CONFIG_CRYPTO_DEFLATE is not set
> # CONFIG_CRYPTO_MICHAEL_MIC is not set
> # CONFIG_CRYPTO_CRC32C is not set
> # CONFIG_CRYPTO_TEST is not set
1620c1472
< CONFIG_LIBCRC32C=m
---
> # CONFIG_LIBCRC32C is not set
1622a1475,1478
> CONFIG_TEXTSEARCH=y
> CONFIG_TEXTSEARCH_KMP=m
> CONFIG_TEXTSEARCH_BM=m
> CONFIG_TEXTSEARCH_FSM=m
Index: 2.6.15/series
===================================================================
RCS file: /cvsroot/nslu/kernel/2.6.15/series,v
retrieving revision 1.8
diff -r1.8 series
25a26,27
> 96-loft-ide.patch
> # 99-loft-maclist.patch
cvs diff: Diffing patches
cvs diff: Diffing patches/ixp-osal
cvs diff: Diffing patches/ixp400
cvs diff: Diffing patches/ixp400-eth
cvs diff: Diffing scripts
gs@gs:~/dev/kernel$