diff options
| author | Ben Hutchings <benh@debian.org> | 2012-06-17 18:44:24 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-06-17 18:44:24 +0000 |
| commit | 305049c3a4b0a1ac4bae59eb6965d0ee3ca60abe (patch) | |
| tree | 60550d5ef5590e1822f040705b8a469ec4916968 | |
| parent | 2dc1c810007f0641474d612f36fe9d64e5ca6589 (diff) | |
Update current changelog entry for the name change
svn path=/dists/trunk/linux/; revision=19161
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 0fa68dffb..08b67da18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch index e9abe4768..b77ba7b9d 100644 --- a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch +++ b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch @@ -12,12 +12,6 @@ These drivers are also largely redundant with nouveau. The RIVA 128 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 @@ index d83e967..fe92039 100644 - 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/ |