[kernel] r5528 - in people/waldi/linux-2.6: . debian debian/arch
debian/arch/alpha debian/arch/amd64 debian/arch/arm
debian/arch/hppa debian/arch/i386 debian/arch/ia64
debian/arch/m68k debian/arch/powerpc debian/arch/s390
debian/arch/sparc debian/bin debian/lib/python/debian_linux
debian/patches debian/patches/series debian/templates
Bastian Blank
waldi at costa.debian.org
Fri Jan 20 12:33:01 UTC 2006
Author: waldi
Date: Fri Jan 20 12:32:57 2006
New Revision: 5528
Added:
people/waldi/linux-2.6/debian/arch/arm/config.nslu2
people/waldi/linux-2.6/debian/patches/2.6.15.1.patch
people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch
people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
people/waldi/linux-2.6/debian/patches/arm-nslu2-maclist.patch
people/waldi/linux-2.6/debian/patches/buslogic-pci-id-table.patch
people/waldi/linux-2.6/debian/patches/maclist.patch
people/waldi/linux-2.6/debian/patches/mtdpart-redboot-fis-byteswap.patch
people/waldi/linux-2.6/debian/patches/powerpc-relocate_code.patch
people/waldi/linux-2.6/debian/patches/series/0experimental.1
people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
people/waldi/linux-2.6/debian/patches/sparc64-entry-strace.patch
Removed:
people/waldi/linux-2.6/debian/patches/series/1
people/waldi/linux-2.6/debian/patches/series/2
people/waldi/linux-2.6/debian/patches/series/2-extra
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/arch/alpha/defines
people/waldi/linux-2.6/debian/arch/amd64/config
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8
people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4
people/waldi/linux-2.6/debian/arch/amd64/defines
people/waldi/linux-2.6/debian/arch/arm/config
people/waldi/linux-2.6/debian/arch/arm/config.footbridge
people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
people/waldi/linux-2.6/debian/arch/arm/config.rpc
people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
people/waldi/linux-2.6/debian/arch/arm/defines
people/waldi/linux-2.6/debian/arch/config
people/waldi/linux-2.6/debian/arch/hppa/defines
people/waldi/linux-2.6/debian/arch/i386/config
people/waldi/linux-2.6/debian/arch/i386/defines
people/waldi/linux-2.6/debian/arch/ia64/defines
people/waldi/linux-2.6/debian/arch/m68k/defines
people/waldi/linux-2.6/debian/arch/powerpc/defines
people/waldi/linux-2.6/debian/arch/s390/defines
people/waldi/linux-2.6/debian/arch/sparc/defines
people/waldi/linux-2.6/debian/bin/kconfig.ml
people/waldi/linux-2.6/debian/changelog
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
people/waldi/linux-2.6/debian/patches/hppa-incompatible.patch
people/waldi/linux-2.6/debian/rules
people/waldi/linux-2.6/debian/templates/control.headers.latest.in
people/waldi/linux-2.6/debian/templates/control.image.in
people/waldi/linux-2.6/debian/templates/control.image.latest.in
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/arch/alpha/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/defines (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
flavours: alpha-generic alpha-smp
suggests: aboot, fdutils
Modified: people/waldi/linux-2.6/debian/arch/amd64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config Fri Jan 20 12:32:57 2006
@@ -84,7 +84,6 @@
CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=m
# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-# CONFIG_PCI_MSI is not set
CONFIG_PCI_LEGACY_PROC=y
CONFIG_PCI_NAMES=y
# CONFIG_PCI_DEBUG is not set
@@ -1563,3 +1562,12 @@
CONFIG_PM_LEGACY=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_IPW2100 is not set
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_X86_PC=y
+# CONFIG_X86_VSMP is not set
+CONFIG_VM86=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_COMPUTONE=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_PCI_MSI=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-generic Fri Jan 20 12:32:57 2006
@@ -15,9 +15,7 @@
CONFIG_ISDN_DRV_LOOP=m
CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
-CONFIG_COMPUTONE=m
# CONFIG_DIGIEPCA is not set
-CONFIG_MOXA_INTELLIO=m
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
@@ -42,7 +40,6 @@
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_MAVEN=m
# CONFIG_SOUND_AWE32_SYNTH is not set
-CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_EXT2_FS=y
CONFIG_FS_MBCACHE=y
# CONFIG_CHECKING is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8 (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8 Fri Jan 20 12:32:57 2006
@@ -15,9 +15,7 @@
CONFIG_ISDN_DRV_LOOP=m
CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
-CONFIG_COMPUTONE=m
# CONFIG_DIGIEPCA is not set
-CONFIG_MOXA_INTELLIO=m
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
@@ -42,7 +40,6 @@
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_MAVEN=m
# CONFIG_SOUND_AWE32_SYNTH is not set
-CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.amd64-k8-smp Fri Jan 20 12:32:57 2006
@@ -28,7 +28,6 @@
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_DISCONTIGMEM=y
CONFIG_DISCONTIGMEM_MANUAL=y
CONFIG_X86_MCE_AMD=y
Modified: people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4 (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config.em64t-p4 Fri Jan 20 12:32:57 2006
@@ -15,9 +15,7 @@
CONFIG_ISDN_DRV_LOOP=m
CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
-CONFIG_COMPUTONE=m
# CONFIG_DIGIEPCA is not set
-CONFIG_MOXA_INTELLIO=m
CONFIG_RISCOM8=m
# CONFIG_RIO is not set
CONFIG_STALLION=m
@@ -42,7 +40,6 @@
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_MAVEN=m
# CONFIG_SOUND_AWE32_SYNTH is not set
-CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/defines (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/defines Fri Jan 20 12:32:57 2006
@@ -1,5 +1,5 @@
[base]
-depends: e2fsprogs (>= 1.35-7)
+depends: initramfs-tools | yaird | linux-initramfs-tool, e2fsprogs (>= 1.35-7)
flavours:
amd64-generic
amd64-k8
Modified: people/waldi/linux-2.6/debian/arch/arm/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config Fri Jan 20 12:32:57 2006
@@ -14,6 +14,12 @@
# CONFIG_CIFS_POSIX is not set
CONFIG_ECONET_NATIVE=y
CONFIG_EQUALIZER=m
-CONFIG_NET_CLS_ROUTE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_IPW2100 is not set
+CONFIG_JBD=y
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_TMPFS=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MACLIST is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.footbridge Fri Jan 20 12:32:57 2006
@@ -47,9 +47,7 @@
# Loadable module support
#
CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -324,7 +322,41 @@
#
# Memory Technology Devices (MTD)
#
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_AMDSTD_RETRY=0
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_DC21285=y
+# CONFIG_MTD_IMPA7 is not set
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_PLATRAM is not set
#
# Parallel port support
@@ -430,10 +462,8 @@
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_IDEPCI is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
# CONFIG_IDEDMA_AUTO is not set
# CONFIG_BLK_DEV_HD is not set
@@ -546,7 +576,23 @@
#
# Multi-device support (RAID and LVM)
#
-# CONFIG_MD is not set
+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=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
#
# Fusion MPT device support
@@ -586,7 +632,6 @@
# PHY device support
#
CONFIG_PHYLIB=m
-CONFIG_PHYCONTROL=y
#
# MII PHY device drivers
@@ -604,8 +649,6 @@
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
# CONFIG_EL1 is not set
# CONFIG_EL2 is not set
# CONFIG_ELPLUS is not set
@@ -640,7 +683,6 @@
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
-CONFIG_NE2K_PCI=y
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
@@ -741,7 +783,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
#
@@ -888,7 +930,6 @@
#
# I2C Algorithms
#
-# CONFIG_I2C_ALGOBIT is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALGOPCA is not set
@@ -1044,7 +1085,6 @@
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
@@ -1056,7 +1096,6 @@
CONFIG_VIDEO_SELECT=y
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON_OLD is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
@@ -1066,7 +1105,6 @@
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
CONFIG_FB_CYBLA=m
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_S1D13XXX is not set
@@ -1077,8 +1115,6 @@
#
CONFIG_VGA_CONSOLE=y
# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
#
# Logo configuration
@@ -1120,10 +1156,14 @@
#
# USB Host Controller Drivers
#
-# CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_SL811_HCD is not set
#
@@ -1136,18 +1176,30 @@
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
#
-# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
#
# USB Input Devices
#
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
#
# USB HID Boot Protocol drivers
#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
CONFIG_USB_ACECAD=m
@@ -1184,11 +1236,19 @@
#
# USB Network Adapters
#
-# 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
+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_MON=y
#
@@ -1242,8 +1302,6 @@
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_JBD is not set
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
@@ -1296,7 +1354,6 @@
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
CONFIG_RELAYFS_FS=m
@@ -1313,7 +1370,7 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -1486,33 +1543,20 @@
CONFIG_CRC16=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_ATM_MPOA=m
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_SL82C105=y
# CONFIG_SUNDANCE_MMIO is not set
-# CONFIG_MTD_CFI_I4 is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_SYNCLINK_CS is not set
CONFIG_PCMCIA_WL3501=m
-CONFIG_MTD_ROM=m
-# CONFIG_MTD_EDB7312 is not set
CONFIG_BT_HIDP=m
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_CFI_I8 is not set
# CONFIG_IDEDMA_PCI_AUTO is not set
CONFIG_I82365=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BT_HCIVHCI=m
-CONFIG_MTD_SHARP=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
CONFIG_PCCARD_NONSTATIC=m
# CONFIG_BLK_DEV_4DRIVES is not set
CONFIG_TULIP=m
@@ -1523,27 +1567,20 @@
CONFIG_PRISM54=m
# CONFIG_BLK_DEV_SLC90E66 is not set
CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
# CONFIG_FB_PM3 is not set
CONFIG_AIRO_CS=m
-CONFIG_MTD_AMDSTD=m
CONFIG_BLK_DEV_CY82C693=m
CONFIG_PD6729=m
CONFIG_BT_HCIBFUSB=m
# CONFIG_SCSI_EATA_PIO is not set
-CONFIG_MD_RAID6=m
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_PCMCIA_3C589=m
CONFIG_PCMCIA_WAVELAN=m
# CONFIG_VIDEO_ZR36120 is not set
CONFIG_IEEE1394_ETH1394=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_CFI_STAA=m
CONFIG_WINBOND_840=m
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_INFTL is not set
-# CONFIG_MTD_IMPA7 is not set
CONFIG_WAVELAN=m
# CONFIG_PCMCIA_SYM53C500 is not set
CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
@@ -1558,10 +1595,7 @@
# CONFIG_SCSI_CPQFCTS is not set
# CONFIG_NCPFS_NFS_NS is not set
CONFIG_PCMCIA_AXNET=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_CONCAT is not set
CONFIG_IEEE1394_PCILYNX=m
-# CONFIG_MTD_BLOCK_RO is not set
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_USB_HIDINPUT=y
CONFIG_NET_PCMCIA=y
@@ -1570,7 +1604,6 @@
CONFIG_TMD_HERMES=m
CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_HERMES=m
-CONFIG_MTD_GEN_PROBE=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_LOGO_LINUX_VGA16=y
# CONFIG_IDEPCI_SHARE_IRQ is not set
@@ -1582,9 +1615,7 @@
CONFIG_BLK_DEV_VIA82CXXX=m
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_PDC202XX_FORCE is not set
-CONFIG_MTD_CFI_NOSWAP=y
CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_JFFS2_FS is not set
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_PCI_HERMES=m
CONFIG_CARDBUS=y
@@ -1596,21 +1627,16 @@
CONFIG_LLC=m
CONFIG_BLK_DEV_CMD64X=m
# CONFIG_WDC_ALI15X3 is not set
-# CONFIG_MTD_SLRAM is not set
CONFIG_PLX_HERMES=m
# CONFIG_TULIP_MMIO is not set
CONFIG_STRIP=m
CONFIG_BT_HCIBLUECARD=m
-CONFIG_MTD_RAM=m
CONFIG_BT_BNEP_MC_FILTER=y
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
CONFIG_BT_L2CAP=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_TULIP_MWI is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_BT_BNEP=m
-CONFIG_MTD_CHAR=m
CONFIG_PCMCIA_XIRTULIP=m
CONFIG_PCMCIA_XIRC2PS=m
CONFIG_USB_STORAGE_ISD200=y
@@ -1618,17 +1644,12 @@
CONFIG_PCMCIA_NETWAVE=m
# CONFIG_SCSI_QLOGIC_ISP is not set
# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_MTD_OBSOLETE_CHIPS=y
CONFIG_USB_STORAGE_SDDR09=y
CONFIG_IEEE1394_VIDEO1394=m
CONFIG_BT_HCIBPA10X=m
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
CONFIG_BLK_DEV_CS5520=m
CONFIG_USB_SISUSBVGA=m
-CONFIG_DM_MULTIPATH_EMC=m
CONFIG_PCMCIA_FMVJ18X=m
-# CONFIG_MTD_DOC2001PLUS is not set
CONFIG_PARPORT_NOT_PC=y
# CONFIG_SMP is not set
# CONFIG_8139_OLD_RX_RESET is not set
@@ -1639,7 +1660,6 @@
# CONFIG_E1000_NAPI is not set
# CONFIG_PCMCIA_QLOGIC is not set
CONFIG_BLK_DEV_CS5530=m
-# CONFIG_MTD_NAND is not set
# CONFIG_FTL is not set
CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_I82092=m
@@ -1650,63 +1670,41 @@
# CONFIG_NCPFS_EXTRAS is not set
CONFIG_PCMCIA_XIRCOM=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
-CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_PDC202XX_BURST is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_8139TOO_PIO is not set
# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_MTD_CFI=m
-# CONFIG_MTD_BLKMTD is not set
CONFIG_AIRO=m
-# CONFIG_MTD_OTP is not set
CONFIG_BLK_DEV_TRM290=m
# CONFIG_VIDEO_ZORAN is not set
CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_SL811_CS is not set
CONFIG_HERMES=m
-CONFIG_MTD_BLOCK=m
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_IEEE1394_CMP=m
CONFIG_IEEE1394_SBP2=m
-# CONFIG_MTD_PARTITIONS is not set
# CONFIG_PCMCIA_FDOMAIN is not set
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BT_HCIBCM203X=m
CONFIG_IEEE1394_DV1394=m
CONFIG_PCMCIA_NMCLAN=m
-CONFIG_MD_RAID10=m
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
CONFIG_BLK_DEV_PIIX=m
CONFIG_USB_STORAGE_DPCM=y
CONFIG_BLK_DEV_GENERIC=m
CONFIG_BT_HCIDTL1=m
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
# CONFIG_IEEE1394_OUI_DB is not set
CONFIG_BT_HCIUSB=m
CONFIG_DM9102=m
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_ATMEL=m
CONFIG_DE2104X=m
# CONFIG_NCPFS_SMALLDOS is not set
CONFIG_USB_STORAGE_USBAT=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_JEDEC=m
-CONFIG_MTD_CFI_AMDSTD_RETRY=0
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-# CONFIG_MTD_DEBUG is not set
# CONFIG_NCPFS_STRONG is not set
CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
# CONFIG_BLK_DEV_UMC8672 is not set
-# CONFIG_MTD_PHRAM is not set
CONFIG_BT_HCIBTUART=m
CONFIG_PCMCIA=m
CONFIG_BROKEN=y
@@ -1720,7 +1718,6 @@
CONFIG_FS_MBCACHE=y
CONFIG_NET_WIRELESS=y
CONFIG_BLK_DEV_PDC202XX_NEW=m
-# CONFIG_MTD_PMC551 is not set
CONFIG_PCI_ATMEL=m
CONFIG_BT_HCIBT3C=m
# CONFIG_IPX_INTERN is not set
@@ -1740,9 +1737,109 @@
CONFIG_BLK_DEV_SC1200=m
# CONFIG_R8169_VLAN is not set
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_MTD_XIP is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_IEEE1394_AMDTP is not set
CONFIG_BLK_DEV_PDC202XX_OLD=m
# CONFIG_LANCE is not set
# CONFIG_NET_CLS_ROUTE is not set
+CONFIG_VIDEO_TVEEPROM=m
+# CONFIG_USB_AUDIO is not set
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TUNER=m
+# CONFIG_MEGARAID_MM is not set
+CONFIG_VIDEO_BUF=m
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_TULIP=y
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_NE2K_PCI=m
+# CONFIG_CASSINI is not set
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
+CONFIG_FB_CYBER2000=y
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA_I2C is not set
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+# CONFIG_FB_MATROX_I2C is not set
+# CONFIG_FB_MATROX_MULTIHEAD is not set
+# CONFIG_FB_RADEON_OLD is not set
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_SAVAGE=m
+# CONFIG_FB_SAVAGE_I2C is not set
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_NEOMAGIC=m
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+CONFIG_FB_CYBLA=m
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_ATY_GX=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+# CONFIG_FB_ATY_XL_INIT is not set
+CONFIG_FB_VOODOO1=m
+# CONFIG_MTD_BLOCK2MTD is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_PARTITIONS is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PMC551 is not set
+CONFIG_I2C_ALGOBIT=m
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+# CONFIG_JFFS_PROC_FS is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS_FS_VERBOSE=0
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS_FS=m
Modified: people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx Fri Jan 20 12:32:57 2006
@@ -47,9 +47,7 @@
# Loadable module support
#
CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -412,7 +410,6 @@
CONFIG_NET_SCH_DSMARK=m
# CONFIG_NET_SCH_NETEM is not set
CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
CONFIG_NET_ESTIMATOR=y
CONFIG_NET_CLS=y
# CONFIG_NET_CLS_BASIC is not set
@@ -766,7 +763,6 @@
# PHY device support
#
CONFIG_PHYLIB=m
-CONFIG_PHYCONTROL=y
#
# MII PHY device drivers
@@ -941,7 +937,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
#
@@ -1177,7 +1173,6 @@
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=m
@@ -1232,7 +1227,6 @@
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-CONFIG_TMPFS=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
CONFIG_RELAYFS_FS=m
@@ -1441,3 +1435,9 @@
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
+# CONFIG_PM_DEBUG is not set
+# CONFIG_MEGARAID_MM is not set
+CONFIG_PM_LEGACY=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
Added: people/waldi/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/arch/arm/config.nslu2 Fri Jan 20 12:32:57 2006
@@ -0,0 +1,1490 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.15
+# Thu Jan 12 22:53:46 2006
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+CONFIG_ARCH_IXP4XX=y
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+
+#
+# Intel IXP4xx Implementation Options
+#
+
+#
+# IXP4xx Platforms
+#
+CONFIG_MACH_NSLU2=y
+# CONFIG_ARCH_AVILA is not set
+# CONFIG_ARCH_ADI_COYOTE is not set
+# CONFIG_ARCH_IXDP425 is not set
+# CONFIG_MACH_IXDPG425 is not set
+# CONFIG_MACH_IXDP465 is not set
+# CONFIG_ARCH_PRPMC1100 is not set
+# CONFIG_MACH_GTWX5715 is not set
+
+#
+# IXP4xx Options
+#
+# CONFIG_IXP4XX_INDIRECT_PCI is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_XSCALE_PMU=y
+CONFIG_DMABOUNCE=y
+
+#
+# Bus support
+#
+CONFIG_ISA_DMA_API=y
+CONFIG_PCI=y
+CONFIG_PCI_LEGACY_PROC=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram initrd=0x01000000,10M mem=32M at 0x00000000 noirqdebug"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+CONFIG_NET_IPGRE=m
+# CONFIG_ARPD is not set
+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=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+CONFIG_IP_VS=m
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+CONFIG_IP_NF_CONNTRACK_EVENTS=y
+CONFIG_IP_NF_CONNTRACK_NETLINK=m
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_NETBIOS_NS=m
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+CONFIG_IP_NF_MATCH_MAC=m
+# CONFIG_IP_NF_MATCH_PKTTYPE is not set
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_DSCP is not set
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+# CONFIG_IP_NF_MATCH_HELPER is not set
+CONFIG_IP_NF_MATCH_STATE=m
+# CONFIG_IP_NF_MATCH_CONNTRACK is not set
+CONFIG_IP_NF_MATCH_OWNER=m
+# CONFIG_IP_NF_MATCH_PHYSDEV is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_REALM is not set
+# CONFIG_IP_NF_MATCH_SCTP is not set
+CONFIG_IP_NF_MATCH_DCCP=m
+# CONFIG_IP_NF_MATCH_COMMENT is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
+CONFIG_IP_NF_MATCH_STRING=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_TARGET_NFQUEUE=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_DSCP is not set
+CONFIG_IP_NF_TARGET_MARK=m
+# CONFIG_IP_NF_TARGET_CLASSIFY is not set
+CONFIG_IP_NF_TARGET_TTL=m
+# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+# CONFIG_IP_NF_ARP_MANGLE is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_TFRC_LIB=m
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+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_X25=m
+CONFIG_LAPB=m
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+
+#
+# QoS and/or fair queueing
+#
+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 is not set
+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 is not set
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+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 is not set
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_POLICE=y
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_ESTIMATOR=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+CONFIG_CONNECTOR=m
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+# CONFIG_MTD_CFI_NOSWAP is not set
+CONFIG_MTD_CFI_BE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_IXP4XX=y
+# CONFIG_MTD_PCI is not set
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_NAND_IDS=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
+# CONFIG_MTD_ONENAND is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_MM is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+CONFIG_SCSI_QLA21XX=m
+CONFIG_SCSI_QLA22XX=m
+CONFIG_SCSI_QLA2300=m
+CONFIG_SCSI_QLA2322=m
+CONFIG_SCSI_QLA6312=m
+CONFIG_SCSI_QLA24XX=m
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+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=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_EMC is not set
+
+#
+# Fusion MPT device support
+#
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_CTL=m
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+CONFIG_EQUALIZER=m
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MACLIST=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+CONFIG_CHELSIO_T1=m
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+# CONFIG_IPW2200 is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# 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=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IXP4XX_WATCHDOG=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+CONFIG_TELCLOCK=m
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_IOP3XX is not set
+CONFIG_I2C_ISA=m
+CONFIG_I2C_IXP4XX=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+CONFIG_SENSORS_DS1374=m
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+CONFIG_SENSORS_PCA9539=m
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+CONFIG_SENSORS_MAX6875=m
+CONFIG_RTC_X1205_I2C=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ASB100 is not set
+CONFIG_SENSORS_ATXP1=m
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83792D=m
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# 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
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# 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
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+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=m
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_SECURITY is not set
+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_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+CONFIG_QUOTA=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+CONFIG_RELAYFS_FS=m
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+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_MSDOS_PARTITION=y
+# 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
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+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
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_CAPABILITIES=y
+CONFIG_SECURITY_ROOTPLUG=m
+CONFIG_SECURITY_SECLVL=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+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
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=m
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
Modified: people/waldi/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.rpc (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.rpc Fri Jan 20 12:32:57 2006
@@ -49,10 +49,7 @@
# Loadable module support
#
CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -430,7 +427,6 @@
# PHY device support
#
CONFIG_PHYLIB=m
-CONFIG_PHYCONTROL=y
#
# MII PHY device drivers
@@ -508,7 +504,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
#
@@ -695,7 +691,6 @@
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
@@ -803,7 +798,6 @@
CONFIG_EXT3_FS_XATTR=y
# CONFIG_EXT3_FS_POSIX_ACL is not set
# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=m
@@ -858,7 +852,6 @@
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
CONFIG_RELAYFS_FS=m
@@ -1058,3 +1051,4 @@
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
+CONFIG_SPLIT_PTLOCK_CPUS=4096
Modified: people/waldi/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.s3c2410 Fri Jan 20 12:32:57 2006
@@ -48,9 +48,7 @@
# Loadable module support
#
CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -344,7 +342,6 @@
CONFIG_MTD_RAM=m
CONFIG_MTD_ROM=y
# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
# CONFIG_MTD_XIP is not set
#
@@ -538,7 +535,6 @@
# PHY device support
#
CONFIG_PHYLIB=m
-CONFIG_PHYCONTROL=y
#
# MII PHY device drivers
@@ -605,7 +601,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_EVBUG is not set
#
@@ -818,7 +814,6 @@
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set
@@ -930,7 +925,6 @@
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
@@ -1190,7 +1184,6 @@
CONFIG_BT_L2CAP=m
# CONFIG_USBPCWATCHDOG is not set
CONFIG_PPP_SYNC_TTY=m
-# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_USB_MICROTEK=m
CONFIG_BT_BNEP=m
CONFIG_USB_USS720=m
@@ -1244,7 +1237,6 @@
# CONFIG_BLK_DEV_UB is not set
CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
CONFIG_ACORN_PARTITION_POWERTEC=y
# CONFIG_NETPOLL_TRAP is not set
CONFIG_USB_POWERMATE=m
@@ -1271,3 +1263,49 @@
CONFIG_PPP=m
CONFIG_CRC_CCITT=m
# CONFIG_NET_CLS_ROUTE is not set
+# CONFIG_LANCE is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_ISA=y
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_DEPCA is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_I2C_ELEKTOR is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_TR is not set
+CONFIG_PM_LEGACY=y
+# CONFIG_AT1700 is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_WDT is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_HP100 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_S3C2410_BOOT_ERROR_RESET is not set
+# CONFIG_ARCNET is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MDA_CONSOLE is not set
+# CONFIG_ESPSERIAL is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_PNP is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_BLK_DEV_XD is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/defines (original)
+++ people/waldi/linux-2.6/debian/arch/arm/defines Fri Jan 20 12:32:57 2006
@@ -1,7 +1,9 @@
[base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
flavours:
footbridge
ixp4xx
+ nslu2
rpc
s3c2410
kernel-arch: arm
@@ -16,6 +18,10 @@
class: IXP4xx
longclass: IXP4xx based
+[nslu2]
+class: NSLU2
+longclass: Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives)
+
[rpc]
class: RiscPC
longclass: Arcon RiscPC
Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config (original)
+++ people/waldi/linux-2.6/debian/arch/config Fri Jan 20 12:32:57 2006
@@ -733,3 +733,86 @@
CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_SPI_BITBANG=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_TIPC_ZONES=3
+CONFIG_IP_NF_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_ELF_CORE=y
+CONFIG_USB_UEAGLEATM=m
+CONFIG_TIPC_NODES=255
+CONFIG_DVB_CX24123=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_MTD_M25P80=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_TIPC=m
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+CONFIG_USB_ATI_REMOTE2=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_TIPC_CLUSTERS=1
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+CONFIG_YENTA_O2=y
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_SND_PCXHR=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+# CONFIG_SPI_DEBUG is not set
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_SPI=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_IFB=m
+CONFIG_KARMA_PARTITION=y
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+# CONFIG_USB_LIBUSUAL is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_SKY2=m
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+# CONFIG_CRASH_DUMP is not set
+CONFIG_YENTA_TI=y
+CONFIG_TIPC_LOG=0
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_OBSOLETE_INTERMODULE=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_DMI=y
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_DEBUG_RODATA is not set
+CONFIG_TIPC_SLAVE_NODES=0
+# CONFIG_TIPC_DEBUG is not set
+# CONFIG_SLOB is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
+CONFIG_TIPC_PORTS=8191
+CONFIG_SENSORS_VT8231=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_IP6_NF_MATCH_POLICY=m
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_OCFS2_FS=m
+CONFIG_SPI_MASTER=y
+CONFIG_TIPC_ADVANCED=y
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_SLAB=y
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_FORCED_INLINING is not set
Modified: people/waldi/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/defines (original)
+++ people/waldi/linux-2.6/debian/arch/hppa/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
parisc
parisc-smp
Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config Fri Jan 20 12:32:57 2006
@@ -200,7 +200,6 @@
CONFIG_MTD_RAM=m
CONFIG_MTD_ROM=m
CONFIG_MTD_ABSENT=m
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_PHYSMAP_START=0x8000000
@@ -1798,7 +1797,6 @@
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_1000=y
@@ -1825,3 +1823,15 @@
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_KTIME_SCALAR=y
+CONFIG_DOUBLEFAULT=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_CS5535_GPIO=m
+# CONFIG_MGEODE_LX is not set
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_VM86=y
+CONFIG_SPARSEMEM_STATIC=y
Modified: people/waldi/linux-2.6/debian/arch/i386/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/defines (original)
+++ people/waldi/linux-2.6/debian/arch/i386/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
486
686
Modified: people/waldi/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/defines (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
flavours:
itanium
itanium-smp
Modified: people/waldi/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/defines (original)
+++ people/waldi/linux-2.6/debian/arch/m68k/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
compiler: gcc-3.3
flavours:
amiga
Modified: people/waldi/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/defines (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
flavours:
apus
powerpc
Modified: people/waldi/linux-2.6/debian/arch/s390/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/defines (original)
+++ people/waldi/linux-2.6/debian/arch/s390/defines Fri Jan 20 12:32:57 2006
@@ -1,5 +1,6 @@
[base]
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
+depends: yaird | initramfs-tools | linux-initramfs-tool
flavours: s390 s390x
suggests: s390-tools
kernel-arch: s390
Modified: people/waldi/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/defines (original)
+++ people/waldi/linux-2.6/debian/arch/sparc/defines Fri Jan 20 12:32:57 2006
@@ -1,4 +1,5 @@
[base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
flavours:
sparc64
sparc64-smp
Modified: people/waldi/linux-2.6/debian/bin/kconfig.ml
==============================================================================
--- people/waldi/linux-2.6/debian/bin/kconfig.ml (original)
+++ people/waldi/linux-2.6/debian/bin/kconfig.ml Fri Jan 20 12:32:57 2006
@@ -1,6 +1,8 @@
#!/usr/bin/ocamlrun /usr/bin/ocaml
+(* Command line arguments parsing *)
let basedir = ref "debian/arch"
+let sourcedir = ref "."
let arch = ref ""
let subarch = ref ""
let flavour = ref ""
@@ -8,25 +10,34 @@
let verbose = ref false
let archindir = ref false
+type action = Single | Create | Check
+let action = ref Create
+
+let set_action a () = action := a
+
let spec = [
"-b", Arg.Set_string basedir, "base dir of the arch configurations [default: debian/arch]";
+ "-bs", Arg.Set_string sourcedir, "base source dir containing the patched debian linux source tree [default: .]";
"-ba", Arg.Set archindir, "basedir includes arch";
"-a", Arg.Set_string arch, "arch";
"-s", Arg.Set_string subarch, "subarch";
"-f", Arg.Set_string flavour, "flavour";
"-v", Arg.Set verbose, "verbose";
+ "-c", Arg.Unit (set_action Check), "check";
]
let usage =
- "./kconfig.ml [ -b basedir ] -a arch [ -s subarch ] -f flavour" ^ "\n" ^
- "./kconfig.ml config_file"
+ "Check single config file : ./kconfig.ml config_file\n" ^
+ "Create config file : ./kconfig.ml [ -ba ] [ -b basedir ] -a arch [ -s subarch ] -f flavour" ^ "\n" ^
+ "Check all config files : ./kconfig.ml -c [ -ba ] [ -b basedir ] [ -bs sourcedir ] [ -a arch ] [ -s subarch ] [ -f flavour ]" ^ "\n"
let () = Arg.parse
spec
- (function s -> config_name := s)
+ (function s -> config_name := s; action := Single)
usage
let usage () = Arg.usage spec usage
+(* Config file parsing *)
type options =
| Config_Yes of string
| Config_No of string
@@ -44,8 +55,9 @@
| Config_Empty -> Printf.printf "\n"
exception Comment
+exception Error
-let parse_line fd =
+let parse_config_line fd =
let line = input_line fd in
let len = String.length line in
if len = 0 then Config_Empty else
@@ -83,7 +95,7 @@
(* Map.add behavior ensures the latest entry is the one staying *)
let rec parse_config fd m =
try
- let line = parse_line fd in
+ let line = parse_config_line fd in
match line with
| Config_Comment _ | Config_Empty -> parse_config fd m
| Config_Yes s | Config_No s | Config_Module s | Config_Value (s,_) ->
@@ -101,35 +113,108 @@
with Sys_error s ->
if force then raise (Sys_error s) else m
-let () =
- begin
- if !verbose then
- if !config_name <> "" then
- Printf.eprintf "Reading config file %s" !config_name
- else
- Printf.eprintf "Creating config file for arch %s, subarch %s, flavour %s (basedir is %s)\n" !arch !subarch !flavour !basedir
- end;
- if !config_name <> "" then
- try
- let config = open_in !config_name in
- let m = parse_config config C.empty in
- print_config m;
- close_in config
- with Sys_error s -> Printf.eprintf "Error: %s\n" s
- else if !arch <> "" && !flavour <> "" then
- try
- let dir = if !archindir then Filename.dirname !basedir else !basedir in
+(* Defines parsing *)
+type define =
+ | Defines_Base of string
+ | Defines_Field of string * string
+ | Defines_List of string
+ | Defines_Comment of string
+ | Defines_Error of string
+ | Defines_Empty
+
+let print_define = function
+ | Defines_Base s -> Printf.printf "[%s]\n" s
+ | Defines_Field (n, v) -> Printf.printf "%s:%s\n" n v
+ | Defines_List s -> Printf.printf " %s\n" s
+ | Defines_Comment s -> Printf.printf "#%s\n" s
+ | Defines_Error s -> Printf.printf "*** ERROR *** %s\n" s
+ | Defines_Empty -> Printf.printf "\n"
+
+let parse_define_line fd =
+ let line = input_line fd in
+ let len = String.length line in
+ if len = 0 then begin Defines_Empty end else
+ try
+ match line.[0] with
+ | '#' -> Defines_Comment (String.sub line 1 (len - 1))
+ | '[' -> begin
+ try
+ let c = String.index_from line 1 ']' in
+ Defines_Base (String.sub line 1 (c - 1))
+ with Not_found | Invalid_argument "String.sub" -> raise Error
+ end
+ | ' ' -> Defines_List (String.sub line 1 (len - 1))
+ | _ -> begin
+ try
+ let c = String.index_from line 1 ':' in
+ Defines_Field (String.sub line 0 c, String.sub line (c + 1) (len - c - 1))
+ with Not_found | Invalid_argument "String.sub" -> raise Error
+ end
+ with Error -> Defines_Error line
+
+let rec parse_defines fd m l =
+ try
+ let line = parse_define_line fd in
+ match line with
+ | Defines_Comment _ | Defines_Empty -> parse_defines fd (line::m) (l+1)
+ | Defines_Error error ->
+ Printf.eprintf "*** Error at line %d : %s\n" l error;
+ parse_defines fd m (l+1)
+ | Defines_Base _ | Defines_Field _ | Defines_List _ -> parse_defines fd (line::m) (l+1)
+ with End_of_file -> List.rev m
+
+let parse_defines_file name m force =
+ try
+ let defines = open_in name in
+ let m = parse_defines defines m 0 in
+ close_in defines;
+ m
+ with Sys_error s ->
+ if force then raise (Sys_error s) else m
+
+let print_defines m = List.iter print_define m
+
+(* Main functionality *)
+let get_archdir () = if !archindir then Filename.dirname !basedir else !basedir
+
+let do_single () =
+ try
+ begin if !verbose then Printf.eprintf "Reading config file %s" !config_name end;
+ let config = open_in !config_name in
+ let m = parse_config config C.empty in
+ print_config m;
+ close_in config
+ with Sys_error s -> Printf.eprintf "Error: %s\n" s
+
+let do_create () =
+ if !arch <> "" && !flavour <> "" then begin
+ if !verbose then
+ Printf.eprintf "Creating config file for arch %s, subarch %s, flavour %s (basedir is %s)\n" !arch !subarch !flavour !basedir;
+ let dir = get_archdir () in
let m = parse_config_file (dir ^ "/config") C.empty false in
let archdir = dir ^ "/" ^ !arch in
let m = parse_config_file (archdir ^ "/config") m false in
let m, archdir =
if !subarch <> "" && !subarch <> "none" then
- let archdir = archdir ^ "/" ^ !subarch in
+ let archdir = archdir ^ "/" ^ !subarch in
parse_config_file (archdir ^ "/config") m false, archdir
- else m, archdir
+ else m, archdir
in
let m = parse_config_file (archdir ^ "/config." ^ !flavour) m true in
- print_config m;
- with Sys_error s -> Printf.eprintf "Error: %s\n" s
+ print_config m
+ end
else
usage ()
+
+let do_check () =
+ let dir = get_archdir () in
+ begin if !verbose then Printf.eprintf "Checking config files in %s\n" dir end;
+ let m = parse_defines_file (dir ^ "/defines") [] true in
+ print_defines m
+
+let () = try
+ match !action with
+ | Single -> do_single ()
+ | Create -> do_create ()
+ | Check -> do_check ()
+ with Sys_error s -> Printf.eprintf "Error: %s\n" s; usage ()
Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog (original)
+++ people/waldi/linux-2.6/debian/changelog Fri Jan 20 12:32:57 2006
@@ -1,10 +1,77 @@
-linux-2.6 (2.6.15-2) UNRELEASED; urgency=low
+linux-2.6 (2.6.15+2.6.16-rc1-0experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Frederik Schüler <fs at debian.org> Tue, 17 Jan 2006 20:25:26 +0100
+
+linux-2.6 (2.6.15-3) unstable; urgency=low
+
+ [ Martin Michlmayr ]
+ * [arm] Update configs for 2.6.15; closes: #347998.
+ * [arm] Activate tmpfs.
+ * [arm] Allow modules to be unloaded.
+ * [arm] Enable CONFIG_INPUT_EVDEV since yaird needs this module in
+ order to generate initrds.
+ * [arm/footbridge] Activate IDEPCI so SL82C105 will really be
+ compiled in.
+ * [arm/footbridge] Activate the right network drivers (Tulip and
+ NE2K).
+ * [arm/footbridge] Enable more framebuffer drivers.
+ * debian/patches/arm-fix-dc21285.patch: Fix compilation of DC21285
+ flash driver.
+ * [arm/footbridge] Enable MTD and the DC21285 flash driver.
+ * [arm/footbridge] Enable RAID and LVM modules.
+ * [arm/footbridge] Enable USB modules.
+ * [arm/nslu2] Add an image for Network Storage Link for USB 2.0 Disk
+ Drives.
+ * debian/patches/arm-memory-h-page-shift.patch: Fix error "PAGE_SHIFT
+ undeclared" (Rod Whitby).
+ * debian/patches/mtdpart-redboot-fis-byteswap.patch: recognise a foreign
+ endian RedBoot partition table (John Bowler).
+ * debian/patches/maclist.patch: Add support for the maclist interface
+ (John Bowler).
+ * debian/patches/arm-nslu2-maclist.patch: Add NSLU2 maclist support
+ (John Bowler).
+ * [arm/nslu2] Activate maclist.
+
+ [ maximilian attems ]
+ * Add stable tree 2.6.15.1:
+ - arch/sparc64/Kconfig: fix HUGETLB_PAGE_SIZE_64K dependencies
+ - moxa serial: add proper capability check
+ - fix /sys/class/net/<if>/wireless without dev->get_wireless_stats
+ - Don't match tcp/udp source/destination port for IP fragments
+ - Fix sys_fstat64() entry in 64-bit syscall table.
+ - UFS: inode->i_sem is not released in error path
+ - netlink oops fix due to incorrect error code
+ - Fix onboard video on SPARC Blade 100 for 2.6.{13,14,15}
+ - Fix DoS in netlink_rcv_skb() (CVE-2006-0035)
+ - fix workqueue oops during cpu offline
+ - Fix crash in ip_nat_pptp (CVE-2006-0036)
+ - Fix another crash in ip_nat_pptp (CVE-2006-0037)
+ - ppc32: Re-add embed_config.c to ml300/ep405
+ - Fix ptrace/strace
+ - vgacon: fix doublescan mode
+ - BRIDGE: Fix faulty check in br_stp_recalculate_bridge_id()
+ - skge: handle out of memory on ring changes
+ * Drop merged patch:
+ - sparc64-atyfb-xl-gr-final.patch
+
+ [ Simon Horman ]
+ * Fix booting on PReP machines
+ (Closes: #348040)
+ powerpc-relocate_code.patch
+
+ -- Simon Horman <horms at verge.net.au> Tue, 17 Jan 2006 18:01:17 +0900
+
+linux-2.6 (2.6.15-2) unstable; urgency=low
[ maximilian attems ]
- * Default to initramfs-tools as initramfs generator.
- (Closes: #346141, #343147, #341524)
+ * Default to initramfs-tools as initramfs generator for amd64, hppa, i386,
+ alpha and sparc. More archs will be added once klibc matures.
+ (Closes: #346141, #343147, #341524, #346305)
* Backport alsa patch for opl3 - Fix the unreleased resources.
(Closes: #346273)
+ * Readd buslogic-pci-id-table.patch.
[ dann frazier ]
* [ia64] Update config for 2.6.15.
@@ -19,7 +86,13 @@
[ Norbert Tretkowski ]
* Backport the generic irq framework for alpha. (closes: #339080)
- -- Norbert Tretkowski <nobse at debian.org> Fri, 6 Jan 2006 23:25:46 +0100
+ [ Bastian Blank ]
+ * Remove pre-sarge conflict with hotplug.
+ * Fix hppa diff to apply.
+ * Make the latest packages depend on the corect version of the real images.
+ (closes: #346366)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 10 Jan 2006 16:54:21 +0100
linux-2.6 (2.6.15-1) unstable; urgency=low
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Fri Jan 20 12:32:57 2006
@@ -200,6 +200,7 @@
else:
ret[1] = vars['abiname'] = self.config['base',]['abiname']
ret[2] = "-%s" % vars['abiname']
+ vars['version'] = version['source']
vars['version'] = version['version']
vars['major'] = version['major']
ret[3] = vars
Added: people/waldi/linux-2.6/debian/patches/2.6.15.1.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/2.6.15.1.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,652 @@
+diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
+index f3e9c53..9533f8d 100644
+--- a/arch/ppc/boot/simple/Makefile
++++ b/arch/ppc/boot/simple/Makefile
+@@ -190,6 +190,8 @@ boot-$(CONFIG_REDWOOD_5) += embed_config
+ boot-$(CONFIG_REDWOOD_6) += embed_config.o
+ boot-$(CONFIG_8xx) += embed_config.o
+ boot-$(CONFIG_8260) += embed_config.o
++boot-$(CONFIG_EP405) += embed_config.o
++boot-$(CONFIG_XILINX_ML300) += embed_config.o
+ boot-$(CONFIG_BSEIP) += iic.o
+ boot-$(CONFIG_MBX) += iic.o pci.o qspan_pci.o
+ boot-$(CONFIG_MV64X60) += misc-mv64x60.o
+diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
+index c4b7ad7..3882069 100644
+--- a/arch/sparc64/Kconfig
++++ b/arch/sparc64/Kconfig
+@@ -179,7 +179,7 @@ config HUGETLB_PAGE_SIZE_512K
+ bool "512K"
+
+ config HUGETLB_PAGE_SIZE_64K
+- depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512K
++ depends on !SPARC64_PAGE_SIZE_4MB && !SPARC64_PAGE_SIZE_512KB
+ bool "64K"
+
+ endchoice
+diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
+index 11a8484..7100029 100644
+--- a/arch/sparc64/kernel/entry.S
++++ b/arch/sparc64/kernel/entry.S
+@@ -1657,13 +1657,10 @@ ret_sys_call:
+ /* Check if force_successful_syscall_return()
+ * was invoked.
+ */
+- ldub [%curptr + TI_SYS_NOERROR], %l0
+- brz,pt %l0, 1f
+- nop
+- ba,pt %xcc, 80f
++ ldub [%curptr + TI_SYS_NOERROR], %l2
++ brnz,a,pn %l2, 80f
+ stb %g0, [%curptr + TI_SYS_NOERROR]
+
+-1:
+ cmp %o0, -ERESTART_RESTARTBLOCK
+ bgeu,pn %xcc, 1f
+ andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6
+diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
+index 53eaf23..4821ef1 100644
+--- a/arch/sparc64/kernel/systbls.S
++++ b/arch/sparc64/kernel/systbls.S
+@@ -98,7 +98,7 @@ sys_call_table:
+ .word sys_umount, sys_setgid, sys_getgid, sys_signal, sys_geteuid
+ /*50*/ .word sys_getegid, sys_acct, sys_memory_ordering, sys_nis_syscall, sys_ioctl
+ .word sys_reboot, sys_nis_syscall, sys_symlink, sys_readlink, sys_execve
+-/*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_stat64, sys_getpagesize
++/*60*/ .word sys_umask, sys_chroot, sys_newfstat, sys_fstat64, sys_getpagesize
+ .word sys_msync, sys_vfork, sys_pread64, sys_pwrite64, sys_nis_syscall
+ /*70*/ .word sys_nis_syscall, sys_mmap, sys_nis_syscall, sys64_munmap, sys_mprotect
+ .word sys_madvise, sys_vhangup, sys_nis_syscall, sys_mincore, sys_getgroups
+diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
+index 79e490e..6884443 100644
+--- a/drivers/char/moxa.c
++++ b/drivers/char/moxa.c
+@@ -1661,6 +1661,8 @@ int MoxaDriverIoctl(unsigned int cmd, un
+ case MOXA_FIND_BOARD:
+ case MOXA_LOAD_C320B:
+ case MOXA_LOAD_CODE:
++ if (!capable(CAP_SYS_RAWIO))
++ return -EPERM;
+ break;
+ }
+
+diff --git a/drivers/net/skge.c b/drivers/net/skge.c
+index 00d6830..7f53a58 100644
+--- a/drivers/net/skge.c
++++ b/drivers/net/skge.c
+@@ -43,7 +43,7 @@
+ #include "skge.h"
+
+ #define DRV_NAME "skge"
+-#define DRV_VERSION "1.2"
++#define DRV_VERSION "1.3"
+ #define PFX DRV_NAME " "
+
+ #define DEFAULT_TX_RING_SIZE 128
+@@ -88,15 +88,14 @@ MODULE_DEVICE_TABLE(pci, skge_id_table);
+
+ static int skge_up(struct net_device *dev);
+ static int skge_down(struct net_device *dev);
++static void skge_phy_reset(struct skge_port *skge);
+ static void skge_tx_clean(struct skge_port *skge);
+ static int xm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+ static int gm_phy_write(struct skge_hw *hw, int port, u16 reg, u16 val);
+ static void genesis_get_stats(struct skge_port *skge, u64 *data);
+ static void yukon_get_stats(struct skge_port *skge, u64 *data);
+ static void yukon_init(struct skge_hw *hw, int port);
+-static void yukon_reset(struct skge_hw *hw, int port);
+ static void genesis_mac_init(struct skge_hw *hw, int port);
+-static void genesis_reset(struct skge_hw *hw, int port);
+ static void genesis_link_up(struct skge_port *skge);
+
+ /* Avoid conditionals by using array */
+@@ -276,10 +275,9 @@ static int skge_set_settings(struct net_
+ skge->autoneg = ecmd->autoneg;
+ skge->advertising = ecmd->advertising;
+
+- if (netif_running(dev)) {
+- skge_down(dev);
+- skge_up(dev);
+- }
++ if (netif_running(dev))
++ skge_phy_reset(skge);
++
+ return (0);
+ }
+
+@@ -399,6 +397,7 @@ static int skge_set_ring_param(struct ne
+ struct ethtool_ringparam *p)
+ {
+ struct skge_port *skge = netdev_priv(dev);
++ int err;
+
+ if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||
+ p->tx_pending == 0 || p->tx_pending > MAX_TX_RING_SIZE)
+@@ -409,7 +408,11 @@ static int skge_set_ring_param(struct ne
+
+ if (netif_running(dev)) {
+ skge_down(dev);
+- skge_up(dev);
++ err = skge_up(dev);
++ if (err)
++ dev_close(dev);
++ else
++ dev->set_multicast_list(dev);
+ }
+
+ return 0;
+@@ -430,21 +433,11 @@ static void skge_set_msglevel(struct net
+ static int skge_nway_reset(struct net_device *dev)
+ {
+ struct skge_port *skge = netdev_priv(dev);
+- struct skge_hw *hw = skge->hw;
+- int port = skge->port;
+
+ if (skge->autoneg != AUTONEG_ENABLE || !netif_running(dev))
+ return -EINVAL;
+
+- spin_lock_bh(&hw->phy_lock);
+- if (hw->chip_id == CHIP_ID_GENESIS) {
+- genesis_reset(hw, port);
+- genesis_mac_init(hw, port);
+- } else {
+- yukon_reset(hw, port);
+- yukon_init(hw, port);
+- }
+- spin_unlock_bh(&hw->phy_lock);
++ skge_phy_reset(skge);
+ return 0;
+ }
+
+@@ -516,10 +509,8 @@ static int skge_set_pauseparam(struct ne
+ else
+ skge->flow_control = FLOW_MODE_NONE;
+
+- if (netif_running(dev)) {
+- skge_down(dev);
+- skge_up(dev);
+- }
++ if (netif_running(dev))
++ skge_phy_reset(skge);
+ return 0;
+ }
+
+@@ -1935,7 +1926,6 @@ static void yukon_link_down(struct skge_
+
+ }
+
+- yukon_reset(hw, port);
+ skge_link_down(skge);
+
+ yukon_init(hw, port);
+@@ -2019,6 +2009,22 @@ static void yukon_phy_intr(struct skge_p
+ /* XXX restart autonegotiation? */
+ }
+
++static void skge_phy_reset(struct skge_port *skge)
++{
++ struct skge_hw *hw = skge->hw;
++ int port = skge->port;
++
++ netif_stop_queue(skge->netdev);
++ netif_carrier_off(skge->netdev);
++
++ spin_lock_bh(&hw->phy_lock);
++ if (hw->chip_id == CHIP_ID_GENESIS)
++ genesis_mac_init(hw, port);
++ else
++ yukon_init(hw, port);
++ spin_unlock_bh(&hw->phy_lock);
++}
++
+ /* Basic MII support */
+ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+ {
+@@ -2187,6 +2193,7 @@ static int skge_up(struct net_device *de
+ kfree(skge->rx_ring.start);
+ free_pci_mem:
+ pci_free_consistent(hw->pdev, skge->mem_size, skge->mem, skge->dma);
++ skge->mem = NULL;
+
+ return err;
+ }
+@@ -2197,6 +2204,9 @@ static int skge_down(struct net_device *
+ struct skge_hw *hw = skge->hw;
+ int port = skge->port;
+
++ if (skge->mem == NULL)
++ return 0;
++
+ if (netif_msg_ifdown(skge))
+ printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
+
+@@ -2253,6 +2263,7 @@ static int skge_down(struct net_device *
+ kfree(skge->rx_ring.start);
+ kfree(skge->tx_ring.start);
+ pci_free_consistent(hw->pdev, skge->mem_size, skge->mem, skge->dma);
++ skge->mem = NULL;
+ return 0;
+ }
+
+@@ -2413,18 +2424,23 @@ static void skge_tx_timeout(struct net_d
+
+ static int skge_change_mtu(struct net_device *dev, int new_mtu)
+ {
+- int err = 0;
+- int running = netif_running(dev);
++ int err;
+
+ if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU)
+ return -EINVAL;
+
++ if (!netif_running(dev)) {
++ dev->mtu = new_mtu;
++ return 0;
++ }
++
++ skge_down(dev);
+
+- if (running)
+- skge_down(dev);
+ dev->mtu = new_mtu;
+- if (running)
+- skge_up(dev);
++
++ err = skge_up(dev);
++ if (err)
++ dev_close(dev);
+
+ return err;
+ }
+@@ -3398,8 +3414,8 @@ static int skge_resume(struct pci_dev *p
+ struct net_device *dev = hw->dev[i];
+ if (dev) {
+ netif_device_attach(dev);
+- if (netif_running(dev))
+- skge_up(dev);
++ if (netif_running(dev) && skge_up(dev))
++ dev_close(dev);
+ }
+ }
+ return 0;
+diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
+index 08edbfc..3fefdb0 100644
+--- a/drivers/video/aty/atyfb_base.c
++++ b/drivers/video/aty/atyfb_base.c
+@@ -403,7 +403,7 @@ static struct {
+ { PCI_CHIP_MACH64GM, "3D RAGE XL (Mach64 GM, AGP)", 230, 83, 63, ATI_CHIP_264XL },
+ { PCI_CHIP_MACH64GN, "3D RAGE XL (Mach64 GN, AGP)", 230, 83, 63, ATI_CHIP_264XL },
+ { PCI_CHIP_MACH64GO, "3D RAGE XL (Mach64 GO, PCI-66/BGA)", 230, 83, 63, ATI_CHIP_264XL },
+- { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 230, 83, 63, ATI_CHIP_264XL },
++ { PCI_CHIP_MACH64GR, "3D RAGE XL (Mach64 GR, PCI-33MHz)", 235, 83, 63, ATI_CHIP_264XL | M64F_SDRAM_MAGIC_PLL },
+ { PCI_CHIP_MACH64GL, "3D RAGE XL (Mach64 GL, PCI)", 230, 83, 63, ATI_CHIP_264XL },
+ { PCI_CHIP_MACH64GS, "3D RAGE XL (Mach64 GS, PCI)", 230, 83, 63, ATI_CHIP_264XL },
+
+diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
+index 167de39..f4e1c4b 100644
+--- a/drivers/video/console/vgacon.c
++++ b/drivers/video/console/vgacon.c
+@@ -503,10 +503,16 @@ static int vgacon_doresize(struct vc_dat
+ {
+ unsigned long flags;
+ unsigned int scanlines = height * c->vc_font.height;
+- u8 scanlines_lo, r7, vsync_end, mode;
++ u8 scanlines_lo, r7, vsync_end, mode, max_scan;
+
+ spin_lock_irqsave(&vga_lock, flags);
+
++ outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg);
++ max_scan = inb_p(vga_video_port_val);
++
++ if (max_scan & 0x80)
++ scanlines <<= 1;
++
+ outb_p(VGA_CRTC_MODE, vga_video_port_reg);
+ mode = inb_p(vga_video_port_val);
+
+diff --git a/fs/ufs/super.c b/fs/ufs/super.c
+index 54828eb..2ba11a9 100644
+--- a/fs/ufs/super.c
++++ b/fs/ufs/super.c
+@@ -1296,8 +1296,10 @@ static ssize_t ufs_quota_write(struct su
+ blk++;
+ }
+ out:
+- if (len == towrite)
++ if (len == towrite) {
++ up(&inode->i_sem);
+ return err;
++ }
+ if (inode->i_size < off+len-towrite)
+ i_size_write(inode, off+len-towrite);
+ inode->i_version++;
+diff --git a/kernel/workqueue.c b/kernel/workqueue.c
+index 2bd5aee..d3123c2 100644
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -29,7 +29,8 @@
+ #include <linux/kthread.h>
+
+ /*
+- * The per-CPU workqueue (if single thread, we always use cpu 0's).
++ * The per-CPU workqueue (if single thread, we always use the first
++ * possible cpu).
+ *
+ * The sequence counters are for flush_scheduled_work(). It wants to wait
+ * until until all currently-scheduled works are completed, but it doesn't
+@@ -69,6 +70,8 @@ struct workqueue_struct {
+ static DEFINE_SPINLOCK(workqueue_lock);
+ static LIST_HEAD(workqueues);
+
++static int singlethread_cpu;
++
+ /* If it's single threaded, it isn't in the list of workqueues. */
+ static inline int is_single_threaded(struct workqueue_struct *wq)
+ {
+@@ -102,7 +105,7 @@ int fastcall queue_work(struct workqueue
+
+ if (!test_and_set_bit(0, &work->pending)) {
+ if (unlikely(is_single_threaded(wq)))
+- cpu = any_online_cpu(cpu_online_map);
++ cpu = singlethread_cpu;
+ BUG_ON(!list_empty(&work->entry));
+ __queue_work(per_cpu_ptr(wq->cpu_wq, cpu), work);
+ ret = 1;
+@@ -118,7 +121,7 @@ static void delayed_work_timer_fn(unsign
+ int cpu = smp_processor_id();
+
+ if (unlikely(is_single_threaded(wq)))
+- cpu = any_online_cpu(cpu_online_map);
++ cpu = singlethread_cpu;
+
+ __queue_work(per_cpu_ptr(wq->cpu_wq, cpu), work);
+ }
+@@ -267,7 +270,7 @@ void fastcall flush_workqueue(struct wor
+
+ if (is_single_threaded(wq)) {
+ /* Always use first cpu's area. */
+- flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, any_online_cpu(cpu_online_map)));
++ flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, singlethread_cpu));
+ } else {
+ int cpu;
+
+@@ -320,7 +323,7 @@ struct workqueue_struct *__create_workqu
+ lock_cpu_hotplug();
+ if (singlethread) {
+ INIT_LIST_HEAD(&wq->list);
+- p = create_workqueue_thread(wq, any_online_cpu(cpu_online_map));
++ p = create_workqueue_thread(wq, singlethread_cpu);
+ if (!p)
+ destroy = 1;
+ else
+@@ -374,7 +377,7 @@ void destroy_workqueue(struct workqueue_
+ /* We don't need the distraction of CPUs appearing and vanishing. */
+ lock_cpu_hotplug();
+ if (is_single_threaded(wq))
+- cleanup_workqueue_thread(wq, any_online_cpu(cpu_online_map));
++ cleanup_workqueue_thread(wq, singlethread_cpu);
+ else {
+ for_each_online_cpu(cpu)
+ cleanup_workqueue_thread(wq, cpu);
+@@ -543,6 +546,7 @@ static int __devinit workqueue_cpu_callb
+
+ void init_workqueues(void)
+ {
++ singlethread_cpu = first_cpu(cpu_possible_map);
+ hotcpu_notifier(workqueue_cpu_callback, 0);
+ keventd_wq = create_workqueue("events");
+ BUG_ON(!keventd_wq);
+diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
+index ac09b6a..491f49d 100644
+--- a/net/bridge/br_stp_if.c
++++ b/net/bridge/br_stp_if.c
+@@ -158,7 +158,7 @@ void br_stp_recalculate_bridge_id(struct
+
+ list_for_each_entry(p, &br->port_list, list) {
+ if (addr == br_mac_zero ||
+- compare_ether_addr(p->dev->dev_addr, addr) < 0)
++ memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
+ addr = p->dev->dev_addr;
+
+ }
+diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
+index 7323805..f158fe6 100644
+--- a/net/bridge/netfilter/ebt_ip.c
++++ b/net/bridge/netfilter/ebt_ip.c
+@@ -15,6 +15,7 @@
+ #include <linux/netfilter_bridge/ebtables.h>
+ #include <linux/netfilter_bridge/ebt_ip.h>
+ #include <linux/ip.h>
++#include <net/ip.h>
+ #include <linux/in.h>
+ #include <linux/module.h>
+
+@@ -51,6 +52,8 @@ static int ebt_filter_ip(const struct sk
+ if (!(info->bitmask & EBT_IP_DPORT) &&
+ !(info->bitmask & EBT_IP_SPORT))
+ return EBT_MATCH;
++ if (ntohs(ih->frag_off) & IP_OFFSET)
++ return EBT_NOMATCH;
+ pptr = skb_header_pointer(skb, ih->ihl*4,
+ sizeof(_ports), &_ports);
+ if (pptr == NULL)
+diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
+index e2137f3..2941c02 100644
+--- a/net/core/net-sysfs.c
++++ b/net/core/net-sysfs.c
+@@ -16,6 +16,7 @@
+ #include <net/sock.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/wireless.h>
++#include <net/iw_handler.h>
+
+ #define to_class_dev(obj) container_of(obj,struct class_device,kobj)
+ #define to_net_dev(class) container_of(class, struct net_device, class_dev)
+@@ -313,13 +314,19 @@ static ssize_t wireless_show(struct clas
+ char *))
+ {
+ struct net_device *dev = to_net_dev(cd);
+- const struct iw_statistics *iw;
++ const struct iw_statistics *iw = NULL;
+ ssize_t ret = -EINVAL;
+
+ read_lock(&dev_base_lock);
+- if (dev_isalive(dev) && dev->get_wireless_stats
+- && (iw = dev->get_wireless_stats(dev)) != NULL)
+- ret = (*format)(iw, buf);
++ if (dev_isalive(dev)) {
++ if(dev->wireless_handlers &&
++ dev->wireless_handlers->get_wireless_stats)
++ iw = dev->wireless_handlers->get_wireless_stats(dev);
++ else if (dev->get_wireless_stats)
++ iw = dev->get_wireless_stats(dev);
++ if (iw != NULL)
++ ret = (*format)(iw, buf);
++ }
+ read_unlock(&dev_base_lock);
+
+ return ret;
+@@ -420,7 +427,8 @@ void netdev_unregister_sysfs(struct net_
+ sysfs_remove_group(&class_dev->kobj, &netstat_group);
+
+ #ifdef WIRELESS_EXT
+- if (net->get_wireless_stats)
++ if (net->get_wireless_stats || (net->wireless_handlers &&
++ net->wireless_handlers->get_wireless_stats))
+ sysfs_remove_group(&class_dev->kobj, &wireless_group);
+ #endif
+ class_device_del(class_dev);
+@@ -453,10 +461,12 @@ int netdev_register_sysfs(struct net_dev
+ goto out_unreg;
+
+ #ifdef WIRELESS_EXT
+- if (net->get_wireless_stats &&
+- (ret = sysfs_create_group(&class_dev->kobj, &wireless_group)))
+- goto out_cleanup;
+-
++ if (net->get_wireless_stats || (net->wireless_handlers &&
++ net->wireless_handlers->get_wireless_stats)) {
++ ret = sysfs_create_group(&class_dev->kobj, &wireless_group);
++ if (ret)
++ goto out_cleanup;
++ }
+ return 0;
+ out_cleanup:
+ if (net->get_stats)
+diff --git a/net/ipv4/netfilter/ip_nat_helper_pptp.c b/net/ipv4/netfilter/ip_nat_helper_pptp.c
+index e546203..50960cb 100644
+--- a/net/ipv4/netfilter/ip_nat_helper_pptp.c
++++ b/net/ipv4/netfilter/ip_nat_helper_pptp.c
+@@ -148,14 +148,14 @@ pptp_outbound_pkt(struct sk_buff **pskb,
+ {
+ struct ip_ct_pptp_master *ct_pptp_info = &ct->help.ct_pptp_info;
+ struct ip_nat_pptp *nat_pptp_info = &ct->nat.help.nat_pptp_info;
+-
+- u_int16_t msg, *cid = NULL, new_callid;
++ u_int16_t msg, new_callid;
++ unsigned int cid_off;
+
+ new_callid = htons(ct_pptp_info->pns_call_id);
+
+ switch (msg = ntohs(ctlh->messageType)) {
+ case PPTP_OUT_CALL_REQUEST:
+- cid = &pptpReq->ocreq.callID;
++ cid_off = offsetof(union pptp_ctrl_union, ocreq.callID);
+ /* FIXME: ideally we would want to reserve a call ID
+ * here. current netfilter NAT core is not able to do
+ * this :( For now we use TCP source port. This breaks
+@@ -172,10 +172,10 @@ pptp_outbound_pkt(struct sk_buff **pskb,
+ ct_pptp_info->pns_call_id = ntohs(new_callid);
+ break;
+ case PPTP_IN_CALL_REPLY:
+- cid = &pptpReq->icreq.callID;
++ cid_off = offsetof(union pptp_ctrl_union, icreq.callID);
+ break;
+ case PPTP_CALL_CLEAR_REQUEST:
+- cid = &pptpReq->clrreq.callID;
++ cid_off = offsetof(union pptp_ctrl_union, clrreq.callID);
+ break;
+ default:
+ DEBUGP("unknown outbound packet 0x%04x:%s\n", msg,
+@@ -197,18 +197,15 @@ pptp_outbound_pkt(struct sk_buff **pskb,
+
+ /* only OUT_CALL_REQUEST, IN_CALL_REPLY, CALL_CLEAR_REQUEST pass
+ * down to here */
+-
+- IP_NF_ASSERT(cid);
+-
+ DEBUGP("altering call id from 0x%04x to 0x%04x\n",
+- ntohs(*cid), ntohs(new_callid));
++ ntohs(*(u_int16_t *)pptpReq + cid_off), ntohs(new_callid));
+
+ /* mangle packet */
+ if (ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
+- (void *)cid - ((void *)ctlh - sizeof(struct pptp_pkt_hdr)),
+- sizeof(new_callid),
+- (char *)&new_callid,
+- sizeof(new_callid)) == 0)
++ cid_off + sizeof(struct pptp_pkt_hdr) +
++ sizeof(struct PptpControlHeader),
++ sizeof(new_callid), (char *)&new_callid,
++ sizeof(new_callid)) == 0)
+ return NF_DROP;
+
+ return NF_ACCEPT;
+@@ -299,7 +296,8 @@ pptp_inbound_pkt(struct sk_buff **pskb,
+ union pptp_ctrl_union *pptpReq)
+ {
+ struct ip_nat_pptp *nat_pptp_info = &ct->nat.help.nat_pptp_info;
+- u_int16_t msg, new_cid = 0, new_pcid, *pcid = NULL, *cid = NULL;
++ u_int16_t msg, new_cid = 0, new_pcid;
++ unsigned int pcid_off, cid_off = 0;
+
+ int ret = NF_ACCEPT, rv;
+
+@@ -307,23 +305,23 @@ pptp_inbound_pkt(struct sk_buff **pskb,
+
+ switch (msg = ntohs(ctlh->messageType)) {
+ case PPTP_OUT_CALL_REPLY:
+- pcid = &pptpReq->ocack.peersCallID;
+- cid = &pptpReq->ocack.callID;
++ pcid_off = offsetof(union pptp_ctrl_union, ocack.peersCallID);
++ cid_off = offsetof(union pptp_ctrl_union, ocack.callID);
+ break;
+ case PPTP_IN_CALL_CONNECT:
+- pcid = &pptpReq->iccon.peersCallID;
++ pcid_off = offsetof(union pptp_ctrl_union, iccon.peersCallID);
+ break;
+ case PPTP_IN_CALL_REQUEST:
+ /* only need to nat in case PAC is behind NAT box */
+- break;
++ return NF_ACCEPT;
+ case PPTP_WAN_ERROR_NOTIFY:
+- pcid = &pptpReq->wanerr.peersCallID;
++ pcid_off = offsetof(union pptp_ctrl_union, wanerr.peersCallID);
+ break;
+ case PPTP_CALL_DISCONNECT_NOTIFY:
+- pcid = &pptpReq->disc.callID;
++ pcid_off = offsetof(union pptp_ctrl_union, disc.callID);
+ break;
+ case PPTP_SET_LINK_INFO:
+- pcid = &pptpReq->setlink.peersCallID;
++ pcid_off = offsetof(union pptp_ctrl_union, setlink.peersCallID);
+ break;
+
+ default:
+@@ -345,25 +343,24 @@ pptp_inbound_pkt(struct sk_buff **pskb,
+ * WAN_ERROR_NOTIFY, CALL_DISCONNECT_NOTIFY pass down here */
+
+ /* mangle packet */
+- IP_NF_ASSERT(pcid);
+ DEBUGP("altering peer call id from 0x%04x to 0x%04x\n",
+- ntohs(*pcid), ntohs(new_pcid));
++ ntohs(*(u_int16_t *)pptpReq + pcid_off), ntohs(new_pcid));
+
+- rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
+- (void *)pcid - ((void *)ctlh - sizeof(struct pptp_pkt_hdr)),
++ rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
++ pcid_off + sizeof(struct pptp_pkt_hdr) +
++ sizeof(struct PptpControlHeader),
+ sizeof(new_pcid), (char *)&new_pcid,
+ sizeof(new_pcid));
+ if (rv != NF_ACCEPT)
+ return rv;
+
+ if (new_cid) {
+- IP_NF_ASSERT(cid);
+ DEBUGP("altering call id from 0x%04x to 0x%04x\n",
+- ntohs(*cid), ntohs(new_cid));
+- rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
+- (void *)cid - ((void *)ctlh - sizeof(struct pptp_pkt_hdr)),
+- sizeof(new_cid),
+- (char *)&new_cid,
++ ntohs(*(u_int16_t *)pptpReq + cid_off), ntohs(new_cid));
++ rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
++ cid_off + sizeof(struct pptp_pkt_hdr) +
++ sizeof(struct PptpControlHeader),
++ sizeof(new_cid), (char *)&new_cid,
+ sizeof(new_cid));
+ if (rv != NF_ACCEPT)
+ return rv;
+diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
+index 96020d7..fc5a735 100644
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -402,7 +402,7 @@ static int netlink_create(struct socket
+ groups = nl_table[protocol].groups;
+ netlink_unlock_table();
+
+- if ((err = __netlink_create(sock, protocol) < 0))
++ if ((err = __netlink_create(sock, protocol)) < 0)
+ goto out_module;
+
+ nlk = nlk_sk(sock->sk);
+@@ -1422,7 +1422,7 @@ static int netlink_rcv_skb(struct sk_buf
+ while (skb->len >= nlmsg_total_size(0)) {
+ nlh = (struct nlmsghdr *) skb->data;
+
+- if (skb->len < nlh->nlmsg_len)
++ if (nlh->nlmsg_len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len)
+ return 0;
+
+ total_len = min(NLMSG_ALIGN(nlh->nlmsg_len), skb->len);
Added: people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,40 @@
+## DP: Fix compilation errors in dc21285.c
+## DP: Patch author: Martin Michlmayr <tbm at cyrius.com>
+## DP: Upstream status: Submitted
+#
+
+--- old/drivers/mtd/maps/dc21285.c~ 2006-01-10 19:40:53.000000000 +0000
++++ new/drivers/mtd/maps/dc21285.c 2006-01-10 19:52:14.000000000 +0000
+@@ -110,8 +110,9 @@
+ {
+ while (len > 0) {
+ map_word d;
+- d.x[0] = *((uint32_t*)from)++;
++ d.x[0] = *((uint32_t*)from);
+ dc21285_write32(map, d, to);
++ from += 4;
+ to += 4;
+ len -= 4;
+ }
+@@ -121,8 +122,9 @@
+ {
+ while (len > 0) {
+ map_word d;
+- d.x[0] = *((uint16_t*)from)++;
++ d.x[0] = *((uint16_t*)from);
+ dc21285_write16(map, d, to);
++ from += 2;
+ to += 2;
+ len -= 2;
+ }
+@@ -131,8 +133,9 @@
+ static void dc21285_copy_to_8(struct map_info *map, unsigned long to, const void *from, ssize_t len)
+ {
+ map_word d;
+- d.x[0] = *((uint8_t*)from)++;
++ d.x[0] = *((uint8_t*)from);
+ dc21285_write8(map, d, to);
++ from++;
+ to++;
+ len--;
+ }
Added: people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/arm-memory-h-page-shift.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,96 @@
+## DP: Fix error "PAGE_SHIFT undeclared"
+## DP: Patch author: Rod Whitby <rod at whitby.id.au>
+## DP: Upstream status: in ARM tree
+#
+
+http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3218/1
+
+PAGE_SHIFT is undeclared in include/asm-arm/arch-ixp4xx/memory.h, identified by the following kernel compilation error:
+
+CC [M] sound/core/memory.o
+In file included from include/asm/memory.h:27,
+from include/asm/io.h:28,
+from sound/core/memory.c:24:
+include/asm/arch/memory.h: In function `__arch_adjust_zones':
+include/asm/arch/memory.h:28: error: `PAGE_SHIFT' undeclared (first use
+in this function)
+
+This patch replaces my previous attempt at fixing this problem (Patch 3214/1) and is based on the following feedback:
+
+Russell King wrote:
+> The error you see came up on SA1100. The best solution was to move
+> the __arch_adjust_zones() function out of line. I suggest ixp4xx
+> does the same.
+
+I have moved the function out of line into arch/arm/mach-ixp4xx/common-pci.c as suggested.
+
+Signed-off-by: Rod Whitby <rod at whitby.id.au>
+
+--- linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h~ 2005-12-30 05:18:27.000000000 +1030
++++ linux-2.6.15-rc7/include/asm-arm/arch-ixp4xx/memory.h 2005-12-30 05:36:04.000000000 +1030
+@@ -16,31 +16,10 @@
+
+ #ifndef __ASSEMBLY__
+
+-/*
+- * Only first 64MB of memory can be accessed via PCI.
+- * We use GFP_DMA to allocate safe buffers to do map/unmap.
+- * This is really ugly and we need a better way of specifying
+- * DMA-capable regions of memory.
+- */
+-static inline void __arch_adjust_zones(int node, unsigned long *zone_size,
+- unsigned long *zhole_size)
+-{
+- unsigned int sz = SZ_64M >> PAGE_SHIFT;
+-
+- /*
+- * Only adjust if > 64M on current system
+- */
+- if (node || (zone_size[0] <= sz))
+- return;
+-
+- zone_size[1] = zone_size[0] - sz;
+- zone_size[0] = sz;
+- zhole_size[1] = zhole_size[0];
+- zhole_size[0] = 0;
+-}
++void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes);
+
+ #define arch_adjust_zones(node, size, holes) \
+- __arch_adjust_zones(node, size, holes)
++ ixp4xx_adjust_zones(node, size, holes)
+
+ #define ISA_DMA_THRESHOLD (SZ_64M - 1)
+
+--- linux-2.6.15-rc7/arch/arm/mach-ixp4xx/common-pci.c~ 2005-12-30 05:16:03.000000000 +1030
++++ linux-2.6.15-rc7/arch/arm/mach-ixp4xx/common-pci.c 2005-12-30 05:43:55.000000000 +1030
+@@ -341,6 +341,29 @@ int dma_needs_bounce(struct device *dev,
+ return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);
+ }
+
++/*
++ * Only first 64MB of memory can be accessed via PCI.
++ * We use GFP_DMA to allocate safe buffers to do map/unmap.
++ * This is really ugly and we need a better way of specifying
++ * DMA-capable regions of memory.
++ */
++void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size,
++ unsigned long *zhole_size)
++{
++ unsigned int sz = SZ_64M >> PAGE_SHIFT;
++
++ /*
++ * Only adjust if > 64M on current system
++ */
++ if (node || (zone_size[0] <= sz))
++ return;
++
++ zone_size[1] = zone_size[0] - sz;
++ zone_size[0] = sz;
++ zhole_size[1] = zhole_size[0];
++ zhole_size[0] = 0;
++}
++
+ void __init ixp4xx_pci_preinit(void)
+ {
+ unsigned long processor_id;
Added: people/waldi/linux-2.6/debian/patches/arm-nslu2-maclist.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/arm-nslu2-maclist.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,67 @@
+## DP: maclist support for nslu2
+## DP: Patch author: John Bowler <jbowler at acm.org>
+## DP: Upstream status: not yet submitted - depends on maclist.patch
+#
+
+--- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
+@@ -16,11 +16,14 @@
+ #include <linux/kernel.h>
+ #include <linux/serial.h>
+ #include <linux/serial_8250.h>
++#include <linux/mtd/mtd.h>
+
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/flash.h>
+
++#include <net/maclist.h>
++
+ static struct flash_platform_data nslu2_flash_data = {
+ .map_name = "cfi_probe",
+ .width = 2,
+@@ -112,8 +115,44 @@
+ gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
+ }
+
++/*
++ * When the RedBoot partition is added the MAC address is read from
++ * it.
++ */
++static void nslu2_flash_add(struct mtd_info *mtd) {
++ if (strcmp(mtd->name, "RedBoot") == 0) {
++ size_t retlen;
++ u_char mac[6];
++
++ /* The MAC is at a known offset... */
++ if (mtd->read(mtd, 0x3FFB0, 6, &retlen, mac) == 0 && retlen == 6) {
++ printk(KERN_INFO "NSLU2 MAC: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
++ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
++ maclist_add(mac);
++ } else {
++ printk(KERN_ERR "NSLU2 MAC: read failed\n");
++ }
++ }
++}
++
++/*
++ * Nothing to do on remove at present.
++ */
++static void nslu2_flash_remove(struct mtd_info *mtd) {
++}
++
++static struct mtd_notifier nslu2_flash_notifier = {
++ .add = nslu2_flash_add,
++ .remove = nslu2_flash_remove,
++};
++
+ static void __init nslu2_init(void)
+ {
++ /* The flash has an ethernet MAC embedded in it which we need,
++ * that is all this notifier does.
++ */
++ register_mtd_user(&nslu2_flash_notifier);
++
+ ixp4xx_sys_init();
+
+ pm_power_off = nslu2_power_off;
Added: people/waldi/linux-2.6/debian/patches/buslogic-pci-id-table.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/buslogic-pci-id-table.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,34 @@
+From: Ben Collins <bcollins at ubuntu.com>
+Date: Tue, 18 Oct 2005 20:12:36 +0000 (-0400)
+Subject: [UBUNTU:scsi/BusLogic] Add MODULE_DEVICE_TABLE
+X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-2.6.git;a=commitdiff;h=94fea61c7b73fdcaa3ff349bd201f6690802c2f2
+
+[UBUNTU:scsi/BusLogic] Add MODULE_DEVICE_TABLE
+
+PatchAuthor: Ben Collins <bcollins at ubuntu.com>
+UpstreamStatus: Unsubmitted
+
+Signed-off-by: Ben Collins <bcollins at ubuntu.com>
+---
+
+--- a/drivers/scsi/BusLogic.c
++++ b/drivers/scsi/BusLogic.c
+@@ -3569,5 +3569,18 @@ static void __exit BusLogic_exit(void)
+
+ __setup("BusLogic=", BusLogic_Setup);
+
++
++/* PCI Devices supported by this driver */
++static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
++ { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,
++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT,
++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++ { }
++};
++MODULE_DEVICE_TABLE(pci, BusLogic_pci_tbl);
++
+ module_init(BusLogic_init);
+ module_exit(BusLogic_exit);
Modified: people/waldi/linux-2.6/debian/patches/hppa-incompatible.patch
==============================================================================
--- people/waldi/linux-2.6/debian/patches/hppa-incompatible.patch (original)
+++ people/waldi/linux-2.6/debian/patches/hppa-incompatible.patch Fri Jan 20 12:32:57 2006
@@ -8984,13 +8984,13 @@
- if (! integrated) {
- if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) {
- snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
-- snd_opl3_free(opl3);
+- snd_device_free(card, opl3);
- return -EBUSY;
- }
- if (r_port != 0 &&
- (opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) {
- snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
-- snd_opl3_free(opl3);
+- snd_device_free(card, opl3);
- return -EBUSY;
- }
- }
Added: people/waldi/linux-2.6/debian/patches/maclist.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/maclist.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,382 @@
+## DP: maclist interface
+## DP: Patch author: John Bowler <jbowler at acm.org>
+## DP: Upstream status: not yet submitted!
+#
+
+--- linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/include/net/maclist.h 1970-01-01 00:00:00.000000000 +0000
+@@ -0,0 +1,23 @@
++#ifndef _MACLIST_H
++#define _MACLIST_H 1
++/*
++ * Interfaces to the MAC repository
++ */
++/*
++ * Add a single entry, returns 0 on success else an error
++ * code. Must *not* be called from an interrupt handler.
++ */
++extern int maclist_add(const u8 id_to_add[6]);
++
++/*
++ * Return the current entry count (valid in any context).
++ */
++extern int maclist_count(void);
++
++/*
++ * Return the ID from the n'th entry (valid in any context),
++ * returns 0 on success, -EINVAL if 'n' is out of range.
++ */
++extern int maclist_read(u8 (*buffer_for_id)[6], int index_of_id_to_return);
++
++#endif /*_MACLIST_H*/
+--- linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/drivers/net/maclist.c 1970-01-01 00:00:00.000000000 +0000
+@@ -0,0 +1,314 @@
++/*
++ * drivers/net/maclist.c
++ *
++ * a simple driver to remember ethernet MAC values
++ *
++ * Some Ethernet hardware implementations have no built-in
++ * storage for allocated MAC values - an example is the Intel
++ * IXP420 chip which has support for Ethernet but no defined
++ * way of storing allocated MAC values. With such hardware
++ * different board level implementations store the allocated
++ * MAC (or MACs) in different ways. Rather than put board
++ * level code into a specific Ethernet driver this driver
++ * provides a generally accessible repository for the MACs
++ * which can be written by board level code and read by the
++ * driver.
++ *
++ * The implementation also allows user level programs to
++ * access the MAC information in /proc/net/maclist. This is
++ * useful as it allows user space code to use the MAC if it
++ * is not used by a built-in driver.
++ *
++ * Copyright (C) 2005 John Bowler
++ * Author: John Bowler <jbowler at acm.org>
++ * Maintainers: http://www.nslu2-linux.org/
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * External interfaces:
++ * Interfaces to linux kernel (and modules)
++ * maclist_add: add a single MAC
++ * maclist_count: total number of MACs stored
++ * maclist_read: read a MAC 0..(maclist_count-1)
++ */
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/etherdevice.h>
++#include <linux/proc_fs.h>
++#include <linux/errno.h>
++
++#include <net/maclist.h>
++
++#define MACLIST_NAME "maclist"
++
++MODULE_AUTHOR("John Bowler <jbowler at acm.org>");
++MODULE_DESCRIPTION("MAC list repository");
++MODULE_LICENSE("GPL");
++
++typedef struct maclist_entry {
++ struct maclist_entry *next; /* Linked list, first first */
++ u8 id[6]; /* 6 byte Ethernet MAC */
++} maclist_entry_t;
++
++/* Access to this list is possible at any time - entries in
++ * the list are never destroyed. Modification of the list is
++ * safe only from the init code (i.e. modification must be
++ * single threaded), but read from an interrupt at the same
++ * time is possible and safe.
++ */
++static maclist_entry_t *maclist_list = 0;
++
++/*
++ * External interfaces.
++ *
++ * Add a single entry, returns 0 on success else an error
++ * code. Must be single threaded.
++ */
++int maclist_add(const u8 new_id[6]) {
++ maclist_entry_t *new_entry, **tail;
++
++ if (new_id == 0 || !is_valid_ether_addr(new_id)) {
++ printk(KERN_ERR MACLIST_NAME ": invalid ethernet address\n");
++ return -EINVAL;
++ }
++ new_entry = kmalloc(sizeof *new_entry, GFP_KERNEL);
++ if (new_entry == 0)
++ return -ENOMEM;
++ new_entry->next = 0;
++ memcpy(new_entry->id, new_id, sizeof new_entry->id);
++
++ tail = &maclist_list;
++ while (*tail != 0)
++ tail = &(*tail)->next;
++ *tail = new_entry;
++ return 0;
++}
++EXPORT_SYMBOL(maclist_add);
++
++/*
++ * Return the current entry count (valid in any context).
++ */
++int maclist_count(void) {
++ maclist_entry_t *tail = maclist_list;
++ int count = 0;
++
++ while (tail != 0) {
++ tail = tail->next;
++ ++count;
++ }
++
++ return count;
++}
++EXPORT_SYMBOL(maclist_count);
++
++/*
++ * Return the ID from the n'th entry (valid in any context),
++ * returns 0 on success, -EINVAL if 'n' is out of range.
++ */
++int maclist_read(u8 (*id)[6], int n) {
++ maclist_entry_t *entry = maclist_list;
++
++ while (n > 0 && entry != 0) {
++ --n;
++ entry = entry->next;
++ }
++
++ if (n == 0 && entry != 0) {
++ memcpy(id, entry->id, sizeof *id);
++ return 0;
++ }
++
++ printk(KERN_ERR MACLIST_NAME ": id does not exist\n");
++ return -EINVAL;
++}
++EXPORT_SYMBOL(maclist_read);
++
++/*
++ * Parameter parsing. The option string is a list of MAC
++ * addresses, comma separated. (The parsing really should
++ * be somewhere central...)
++ */
++static int __init maclist_setup(char *param) {
++ int bytes = 0, seen_a_digit = 0;
++ u8 id[6];
++
++ memset(id, 0, sizeof id);
++
++ if (param) do {
++ int digit = -1;
++ switch (*param) {
++ case '0': digit = 0; break;
++ case '1': digit = 1; break;
++ case '2': digit = 2; break;
++ case '3': digit = 3; break;
++ case '4': digit = 4; break;
++ case '5': digit = 5; break;
++ case '6': digit = 6; break;
++ case '7': digit = 7; break;
++ case '8': digit = 8; break;
++ case '9': digit = 9; break;
++ case 'a': case 'A': digit = 10; break;
++ case 'b': case 'B': digit = 11; break;
++ case 'c': case 'C': digit = 12; break;
++ case 'd': case 'D': digit = 13; break;
++ case 'e': case 'E': digit = 14; break;
++ case 'f': case 'F': digit = 15; break;
++ case ':':
++ if (seen_a_digit)
++ bytes = (bytes+1) & ~1;
++ else
++ bytes += 2; /* i.e. ff::ff is ff:00:ff */
++ seen_a_digit = 0;
++ break;
++ case 0:
++ if (bytes == 0) /* nothing new seen so far */
++ return 0;
++ /*fall through*/
++ case ',': case ';':
++ if (bytes > 0)
++ bytes = 12; /* i.e. all trailing bytes 0 */
++ break;
++ default:
++ printk(KERN_ERR MACLIST_NAME ": invalid character <%c[%d]>\n",
++ *param, *param);
++ return -EINVAL;
++ }
++
++ if (digit >= 0) {
++ id[bytes>>1] = (id[bytes>>1] << 4) + digit; break;
++ ++bytes;
++ seen_a_digit = 1;
++ }
++
++ if (bytes >= 12) {
++ int rc = maclist_add(id);
++ if (rc)
++ return rc;
++ bytes = 0;
++ seen_a_digit = 0;
++ memset(id, 0, sizeof id);
++ if (*param == 0)
++ return 0;
++ }
++ ++param;
++ } while (1);
++
++ return 0;
++}
++
++/*
++ * procfs support, if compiled in.
++ */
++#ifdef CONFIG_PROC_FS
++/*
++ * Character device read
++ */
++static int maclist_getchar(off_t n) {
++ static char xdigit[16] = "0123456789abcdef";
++ maclist_entry_t *head = maclist_list;
++ int b;
++
++ do {
++ if (head == 0)
++ return -1;
++ if (n < 18)
++ break;
++ head = head->next;
++ n -= 18;
++ } while (1);
++
++ if (n == 17)
++ return '\n';
++
++ b = n/3;
++ switch (n - b*3) {
++ case 0: return xdigit[head->id[b] >> 4];
++ case 1: return xdigit[head->id[b] & 0xf];
++ default: return ':';
++ }
++}
++
++/*
++ * The extensively undocumented proc_read_t callback is implemented here.
++ * Go look in fs/proc/generic.c:
++ *
++ * Prototype:
++ * int f(char *buffer, char **start, off_t offset,
++ * int count, int *peof, void *dat)
++ *
++ * Assume that the buffer is "count" bytes in size.
++ *
++ * 2) Set *start = an address within the buffer.
++ * Put the data of the requested offset at *start.
++ * Return the number of bytes of data placed there.
++ * If this number is greater than zero and you
++ * didn't signal eof and the reader is prepared to
++ * take more data you will be called again with the
++ * requested offset advanced by the number of bytes
++ * absorbed.
++ */
++static int maclist_proc_read(char *buffer, char **start, off_t offset,
++ int count, int *peof, void *dat) {
++ int total;
++
++ *start = buffer;
++ total = 0;
++
++ while (total < count) {
++ int ch = maclist_getchar(offset++);
++ if (ch == -1) {
++ *peof = 1;
++ break;
++ }
++ *buffer++ = ch;
++ ++total;
++ }
++
++ return total;
++}
++#endif
++
++/*
++ * Finally, the init/exit functions.
++ */
++static void __exit maclist_exit(void)
++{
++ maclist_entry_t *list;
++
++ remove_proc_entry(MACLIST_NAME, proc_net);
++
++ list = maclist_list;
++ maclist_list = 0;
++
++ while (list != 0) {
++ maclist_entry_t *head = list;
++ list = head->next;
++ kfree(head);
++ }
++}
++
++#ifdef MODULE
++static char ids[256];
++module_param_string(ids, ids, sizeof ids, 0);
++MODULE_PARM_DESC(ids, "comma separated list of MAC ids\n");
++#else
++__setup("maclist_ids=", maclist_setup);
++#endif
++
++static int __init maclist_init(void)
++{
++# ifdef MODULE
++ if (ids[0])
++ maclist_setup(ids);
++# endif
++
++ /* Ignore failure, the module will still work. */
++ (void)create_proc_read_entry(MACLIST_NAME, S_IRUGO, proc_net, maclist_proc_read, NULL);
++
++ return 0;
++}
++
++module_init(maclist_init);
++module_exit(maclist_exit);
+--- linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/drivers/net/Makefile 1970-01-01 00:00:00.000000000 +0000
+@@ -70,6 +70,7 @@ obj-$(CONFIG_RIONET) += rionet.o
+ # end link order section
+ #
+
++obj-$(CONFIG_MACLIST) += maclist.o
+ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_PHYLIB) += phy/
+
+--- linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/drivers/net/Kconfig 1970-01-01 00:00:00.000000000 +0000
+@@ -166,6 +166,21 @@ config NET_ETHERNET
+ kernel: saying N will just cause the configurator to skip all
+ the questions about Ethernet network cards. If unsure, say N.
+
++config MACLIST
++ tristate "Ethernet MAC repository"
++ depends on NET_ETHERNET
++ help
++ Some ethernet controllers have no built-in way of obtaining an
++ appropriate Ethernet MAC address. Such controllers have to be
++ initialised in a board-specific way, depending on how the allocated
++ MAC is stored. The MAC repository provides a set of APIs and a
++ proc entry (/proc/net/maclist) to store MAC values from the board
++ so that such drivers can obtain a MAC address without board-specific
++ code. You do not need to enable this device - it will be selected
++ automatically by any device which requires it. It is only useful
++ to enable it manually when building a device driver independently
++ of the kernel build.
++
+ config MII
+ tristate "Generic Media Independent Interface device support"
+ depends on NET_ETHERNET
Added: people/waldi/linux-2.6/debian/patches/mtdpart-redboot-fis-byteswap.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/mtdpart-redboot-fis-byteswap.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,75 @@
+## DP: recognise a foreign byte sex partition table
+## DP: Patch author: John Bowler <jbowler at acm.org>
+## DP: Upstream status: in MTD tree
+#
+
+drivers/mtd/redboot.c: recognise a foreign byte sex partition table
+
+The RedBoot boot loader writes flash partition tables containing native
+byte sex 32 bit values. When booting an opposite byte sex kernel (e.g. an
+LE kernel from BE RedBoot) the current MTD driver fails to handle the
+partition table and therefore is unable to generate the correct partition
+map for the flash.
+
+The patch recognises that the FIS directory (the partition table) is
+byte-reversed by examining the partition table size, which is known to be
+one erase block (this is an assumption made elsewhere in redboot.c). If
+the size matches the erase block after byte swapping the value then
+byte-reversal is assumed, if not no further action is taken. The patched
+code is fail safe; should redboot.c be changed to support a partition table
+with a modified size field the test will fail and the partition table will
+be assumed to have the host byte sex.
+
+If byte-reversal is detected the patch byte swaps the remainder of the 32
+bit fields in the copy of the table; this copy is then used to set up the
+MTD partition map.
+
+Signed-off-by: John Bowler <jbowler at acm.org>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Modified slightly and
+Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
+
+Index: drivers/mtd/redboot.c
+===================================================================
+RCS file: /home/cvs/mtd/drivers/mtd/redboot.c,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -p -r1.18 -r1.19
+--- linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/drivers/mtd/redboot.c 1970-01-01 00:00:00.000000000 +0000
+@@ -89,8 +89,32 @@ static int parse_redboot_partitions(stru
+ i = numslots;
+ break;
+ }
+- if (!memcmp(buf[i].name, "FIS directory", 14))
++ if (!memcmp(buf[i].name, "FIS directory", 14)) {
++ /* This is apparently the FIS directory entry for the
++ * FIS directory itself. The FIS directory size is
++ * one erase block; if the buf[i].size field is
++ * swab32(erasesize) then we know we are looking at
++ * a byte swapped FIS directory - swap all the entries!
++ * (NOTE: this is 'size' not 'data_length'; size is
++ * the full size of the entry.)
++ */
++ if (swab32(buf[i].size) == master->erasesize) {
++ int j;
++ for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
++ /* The unsigned long fields were written with the
++ * wrong byte sex, name and pad have no byte sex.
++ */
++ swab32s(&buf[j].flash_base);
++ swab32s(&buf[j].mem_base);
++ swab32s(&buf[j].size);
++ swab32s(&buf[j].entry_point);
++ swab32s(&buf[j].data_length);
++ swab32s(&buf[j].desc_cksum);
++ swab32s(&buf[j].file_cksum);
++ }
++ }
+ break;
++ }
+ }
+ if (i == numslots) {
+ /* Didn't find it */
+
+
Added: people/waldi/linux-2.6/debian/patches/powerpc-relocate_code.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/powerpc-relocate_code.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,76 @@
+commit aed9c6ccb87d96c333bd6ae631d9e90f3b6d7271
+tree 65366c1ddedfbec62cb422686a5c6b0d734ce5e5
+parent 2fb9d2063626374dd8a2514b3a730facac8235d8
+author Paul Janzen <pcj at linux.sez.to> Wed, 04 Jan 2006 21:40:48 -0800
+committer Paul Mackerras <paulus at samba.org> Mon, 09 Jan 2006 15:47:08 +1100
+
+ [PATCH] ppc32: Put cache flush routines back into .relocate_code section
+
+ In 2.6.14, we had the following definition of _GLOBAL() in
+ include/asm-ppc/processor.h:
+
+ #define _GLOBAL(n)\
+ .stabs __stringify(n:F-1),N_FUN,0,0,n;\
+ .globl n;\
+ n:
+
+ In 2.6.15, as part of the great powerpc merge, we moved this definition to
+ include/asm-powerpc/ppc_asm.h, where it appears (to 32-bit code) as:
+
+ #define _GLOBAL(n) \
+ .text; \
+ .stabs __stringify(n:F-1),N_FUN,0,0,n;\
+ .globl n; \
+ n:
+
+ Mostly, this is fine. However, we also have the following, in
+ arch/ppc/boot/common/util.S:
+
+ .section ".relocate_code","xa"
+ [...]
+ _GLOBAL(flush_instruction_cache)
+ [...]
+ _GLOBAL(flush_data_cache)
+ [...]
+
+ The addition of the .text section definition in the definition of
+ _GLOBAL overrides the .relocate_code section definition. As a result,
+ these two functions don't end up in .relocate_code, so they don't get
+ relocated correctly, and the boot fails.
+
+ There's another suspicious-looking usage at kernel/swsusp.S:37 that
+ someone should look into. I did not exhaustively search the source
+ tree, though.
+
+ The following is the minimal patch that fixes the immediate problem.
+ I could easily be convinced that the _GLOBAL definition should be
+ modified to remove the ".text;" line either instead of, or in addition
+ to, this fix.
+
+ Signed-off-by: Paul Janzen <pcj at linux.sez.to>
+ Signed-off-by: Paul Mackerras <paulus at samba.org>
+
+diff --git a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S
+index c96c9f8..368ec03 100644
+--- a/arch/ppc/boot/common/util.S
++++ b/arch/ppc/boot/common/util.S
+@@ -234,7 +234,8 @@ udelay:
+ * First, flush the data cache in case it was enabled and may be
+ * holding instructions for copy back.
+ */
+-_GLOBAL(flush_instruction_cache)
++ .globl flush_instruction_cache
++flush_instruction_cache:
+ mflr r6
+ bl flush_data_cache
+
+@@ -279,7 +280,8 @@ _GLOBAL(flush_instruction_cache)
+ * Flush data cache
+ * Do this by just reading lots of stuff into the cache.
+ */
+-_GLOBAL(flush_data_cache)
++ .globl flush_data_cache
++flush_data_cache:
+ lis r3,cache_flush_buffer at h
+ ori r3,r3,cache_flush_buffer at l
+ li r4,NUM_CACHE_LINES
Added: people/waldi/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1 Fri Jan 20 12:32:57 2006
@@ -0,0 +1,29 @@
++ buslogic-pci-id-table.patch
+#FIXME + drivers-scsi-megaraid_splitup.patch
++ fbdev-radeon-noaccel.patch
++ fs-asfs-2.patch
++ modular-ide-pnp.patch
++ version.patch
+#
++ arm-fix-dc21285.patch
++ mtdpart-redboot-fis-byteswap.patch
++ ia64-irq-affinity-upfix.patch
++ m68k-bvme.patch
++ m68k-mvme147.patch
++ m68k-mvme16x.patch
++ m68k-spinlock.patch
++ powerpc-mkvmlinuz-support.patch
++ powerpc-build-links.patch
++ powerpc-mv643xx-spinlock-fix-support.patch
++ powerpc-prep-utah-ide-interrupt.patch
++ powerpc-mv643xx-hotplug-support.patch
+#FIXME + powerpc-serial.patch
+#FIXME + powerpc-apus.patch
++ sparc64-hme-lockup.patch
+#
+# already disabled in 2.6.15:
+#
+#+ remove-references-to-removed-drivers.patch
+#+ sparc64-entry-strace.patch
+#+ s390-uaccess-const.patch
+#+ tty-locking-fixes9.patch
Added: people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1-extra Fri Jan 20 12:32:57 2006
@@ -0,0 +1,4 @@
++ hppa-incompatible.patch hppa
++ m68k-incompatible.patch m68k
++ maclist.patch arm
++ arm-nslu2-maclist.patch arm
Added: people/waldi/linux-2.6/debian/patches/sparc64-entry-strace.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/sparc64-entry-strace.patch Fri Jan 20 12:32:57 2006
@@ -0,0 +1,23 @@
+# In http://marc.theaimsgroup.com/?l=linux-sparc&m=113678944402745&w=2
+# David Miller wrote:
+#
+# We're spamming the existing flags value in register %l0, thus
+# corrupting the subsequent tracing flag et al. checks.
+#
+# This should fix it:
+#
+# diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
+# index 11a8484..86ff6a9 100644
+--- a/arch/sparc64/kernel/entry.S
++++ b/arch/sparc64/kernel/entry.S
+@@ -1657,8 +1657,8 @@ ret_sys_call:
+ /* Check if force_successful_syscall_return()
+ * was invoked.
+ */
+- ldub [%curptr + TI_SYS_NOERROR], %l0
+- brz,pt %l0, 1f
++ ldub [%curptr + TI_SYS_NOERROR], %l1
++ brz,pt %l1, 1f
+ nop
+ ba,pt %xcc, 80f
+ stb %g0, [%curptr + TI_SYS_NOERROR]
Modified: people/waldi/linux-2.6/debian/rules
==============================================================================
--- people/waldi/linux-2.6/debian/rules (original)
+++ people/waldi/linux-2.6/debian/rules Fri Jan 20 12:32:57 2006
@@ -83,4 +83,22 @@
@echo
exit 1
+#
+# Rule to check all configs snipplets in debian/arch
+#
+
+CheckConfs_DIR := $(BUILD_DIR)/check
+
+$(CheckConfs_DIR) source-configs: debian/control $(BUILD_DIR) $(STAMPS_DIR)
+ $(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)-real
+ rm -rf '$(CheckConfs_DIR)'
+ cp -al $(BUILD_DIR)/source $(CheckConfs_DIR)
+
+check-configs: $(CheckConfs_DIR)
+ @echo "Checking all configuration files"
+ ocaml debian/bin/kconfig.ml -c -b "debian/arch"
+
+clean-configs:
+ rm -rf '$(CheckConfs_DIR)'
+
.PHONY: clean build setup binary-indep binary-arch binary
Modified: people/waldi/linux-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.latest.in Fri Jan 20 12:32:57 2006
@@ -1,7 +1,7 @@
Package: linux-headers- at major@@subarch at -@flavour@
Section: devel
Priority: optional
-Depends: linux-headers- at version@- at abiname@@subarch at -@flavour@
+Depends: linux-headers- at version@- at abiname@@subarch at -@flavour@ (= ${Source-Version})
Provides: linux-headers, linux-headers- at major@
Description: Architecture-specific header files for Linux kernel @major@ on @class@ machines
This package depends on the architecture-specific header files for the latest
Modified: people/waldi/linux-2.6/debian/templates/control.image.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.in Fri Jan 20 12:32:57 2006
@@ -2,8 +2,7 @@
Section: base
Priority: optional
Provides: linux-image, linux-image- at major@
-Depends: initramfs-tools | yaird | linux-initramfs-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1)
+Depends: module-init-tools (>= 0.9.13)
Suggests: linux-doc- at version@ | linux-source- at version@
Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for
Modified: people/waldi/linux-2.6/debian/templates/control.image.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.latest.in Fri Jan 20 12:32:57 2006
@@ -1,7 +1,7 @@
Package: linux-image at subarch@- at flavour@
Section: base
Priority: optional
-Depends: linux-image- at major@@subarch at -@flavour@
+Depends: linux-image- at major@@subarch at -@flavour@ (= ${Source-Version})
Description: Linux kernel image on @class@ machines
This package depends on the latest binary image for Linux kernel on
@longclass@ machines.
@@ -9,7 +9,7 @@
Package: linux-image- at major@@subarch at -@flavour@
Section: base
Priority: optional
-Depends: linux-image- at version@- at abiname@@subarch at -@flavour@
+Depends: linux-image- at version@- at abiname@@subarch at -@flavour@ (= ${Source-Version})
Description: Linux kernel @major@ image on @class@ machines
This package depends on the latest binary image for Linux kernel @major@
on @longclass@ machines.
More information about the Kernel-svn-changes
mailing list