[kernel] r19860 - in dists/sid/linux/debian: . config config/sparc

[Ben Hutchings]

Author: benh
Date: Tue Feb 26 02:24:12 2013
New Revision: 19860

Log:
Attempt to fix FTBFS on s390,s390x,sparc

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/defines
   dists/sid/linux/debian/config/sparc/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Feb 25 15:48:46 2013	(r19859)
+++ dists/sid/linux/debian/changelog	Tue Feb 26 02:24:12 2013	(r19860)
@@ -1,3 +1,10 @@
+linux (3.2.39-2) UNRELEASED; urgency=high
+
+  * [s390,s390x] virtio: Ignore ABI changes in 3.2.39 (fixes FTBFS)
+  * [sparc] drm: Change from built-in to module (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 26 Feb 2013 02:19:28 +0000
+
 linux (3.2.39-1) unstable; urgency=high
 
   * New upstream stable update:

Modified: dists/sid/linux/debian/config/defines
==============================================================================
--- dists/sid/linux/debian/config/defines	Mon Feb 25 15:48:46 2013	(r19859)
+++ dists/sid/linux/debian/config/defines	Tue Feb 26 02:24:12 2013	(r19860)
@@ -31,7 +31,11 @@
  module:drivers/net/wan/cycx_drv
  module:net/wanrouter/wanrouter
 # No-one tries to use virtio from OOT
- module:drivers/virtio/*
+ register_virtio_*
+ unregister_virtio_*
+ virtio_*
+ virtqueue_*
+ vring_*
 # No-one should depend on staging from OOT
  module:drivers/staging/*
 # Doesn't appear to be used OOT

Modified: dists/sid/linux/debian/config/sparc/config
==============================================================================
--- dists/sid/linux/debian/config/sparc/config	Mon Feb 25 15:48:46 2013	(r19859)
+++ dists/sid/linux/debian/config/sparc/config	Tue Feb 26 02:24:12 2013	(r19860)
@@ -68,7 +68,7 @@
 ##
 ## file: drivers/gpu/drm/Kconfig
 ##
-CONFIG_DRM=y
+CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m