[kernel] r19161 - in dists/trunk/linux/debian: . patches/debian/dfsg

[Ben Hutchings]

Author: benh
Date: Sun Jun 17 18:44:24 2012
New Revision: 19161

Log:
Update current changelog entry for the name change

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Jun 17 03:29:04 2012	(r19160)
+++ dists/trunk/linux/debian/changelog	Sun Jun 17 18:44:24 2012	(r19161)
@@ -1,4 +1,4 @@
-linux-2.6 (3.4.2-1~experimental.1) UNRELEASED; urgency=low
+linux (3.4.2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.2

Modified: dists/trunk/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
==============================================================================
--- dists/trunk/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch	Sun Jun 17 03:29:04 2012	(r19160)
+++ dists/trunk/linux/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch	Sun Jun 17 18:44:24 2012	(r19161)
@@ -12,12 +12,6 @@
 probably discontinued 10 years ago.
 
 ---
- drivers/video/Kconfig  |   95 ------------------------------------------------
- drivers/video/Makefile |    2 -
- 2 files changed, 97 deletions(-)
-
-diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index d83e967..fe92039 100644
 --- a/drivers/video/Kconfig
 +++ b/drivers/video/Kconfig
 @@ -1028,101 +1028,6 @@ config FB_ATMEL_STN
@@ -119,16 +113,14 @@
 -	help
 -	  Say Y here if you want to control the backlight of your display.
 -
- config FB_I810
- 	tristate "Intel 810/815 support (EXPERIMENTAL)"
- 	depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
-diff --git a/drivers/video/Makefile b/drivers/video/Makefile
-index 9b9d8ff..4361446 100644
+ config FB_I740
+ 	tristate "Intel740 support (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL && FB && PCI
 --- a/drivers/video/Makefile
 +++ b/drivers/video/Makefile
 @@ -38,8 +38,6 @@ obj-$(CONFIG_FB_PM2)              += pm2fb.o
- obj-$(CONFIG_FB_PM3)		  += pm3fb.o
  
+ obj-$(CONFIG_FB_I740)		  += i740fb.o
  obj-$(CONFIG_FB_MATROX)		  += matrox/
 -obj-$(CONFIG_FB_RIVA)		  += riva/
 -obj-$(CONFIG_FB_NVIDIA)		  += nvidia/