Update current changelog entry for the name change
svn path=/dists/trunk/linux/; revision=19161
This commit is contained in:
parent
2dc1c81000
commit
305049c3a4
|
@ -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:
|
* New upstream stable update:
|
||||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.2
|
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.2
|
||||||
|
|
|
@ -12,12 +12,6 @@ These drivers are also largely redundant with nouveau. The RIVA 128
|
||||||
probably discontinued 10 years ago.
|
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
|
--- a/drivers/video/Kconfig
|
||||||
+++ b/drivers/video/Kconfig
|
+++ b/drivers/video/Kconfig
|
||||||
@@ -1028,101 +1028,6 @@ config FB_ATMEL_STN
|
@@ -1028,101 +1028,6 @@ config FB_ATMEL_STN
|
||||||
|
@ -119,16 +113,14 @@ index d83e967..fe92039 100644
|
||||||
- help
|
- help
|
||||||
- Say Y here if you want to control the backlight of your display.
|
- Say Y here if you want to control the backlight of your display.
|
||||||
-
|
-
|
||||||
config FB_I810
|
config FB_I740
|
||||||
tristate "Intel 810/815 support (EXPERIMENTAL)"
|
tristate "Intel740 support (EXPERIMENTAL)"
|
||||||
depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL
|
depends on EXPERIMENTAL && FB && PCI
|
||||||
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
|
|
||||||
index 9b9d8ff..4361446 100644
|
|
||||||
--- a/drivers/video/Makefile
|
--- a/drivers/video/Makefile
|
||||||
+++ b/drivers/video/Makefile
|
+++ b/drivers/video/Makefile
|
||||||
@@ -38,8 +38,6 @@ obj-$(CONFIG_FB_PM2) += pm2fb.o
|
@@ -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_MATROX) += matrox/
|
||||||
-obj-$(CONFIG_FB_RIVA) += riva/
|
-obj-$(CONFIG_FB_RIVA) += riva/
|
||||||
-obj-$(CONFIG_FB_NVIDIA) += nvidia/
|
-obj-$(CONFIG_FB_NVIDIA) += nvidia/
|
||||||
|
|
Loading…
Reference in New Issue