Author: tbm
Date: Thu Dec 20 05:48:12 2007
New Revision: 9988
Log:
remove my changes since they change the ABI
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/arm/config.iop32x
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Thu Dec 20 05:48:12 2007
@@ -88,11 +88,6 @@
* security: protect from stack expantion into low vm addresses
* [hppa]: Disable OCFS2, due build trouble.
- [ Martin Michlmayr ]
- * [arm/iop32x] Re-enable USB_NET and PPP, thanks Daniel Hess (closes:
- #456416).
- * [arm/iop32x] Enable BSD_PROCESS_ACCT and POSIX_MQUEUE (closes: #455892).
-
[ Aurelien Jarno ]
* [arm/versatile] Disable ACENIC and MYRI10GE as they are useless on this
platform.
Modified: dists/sid/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/sid/linux-2.6/debian/config/arm/config.iop32x Thu Dec 20 05:48:12 2007
@@ -16,9 +16,8 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_AUDIT=y
# CONFIG_IKCONFIG is not set
CONFIG_INITRAMFS_SOURCE=""
@@ -168,16 +167,6 @@
# Networking
#
CONFIG_NET=y
-CONFIG_USB_USBNET=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
#
# Networking options
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
