diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-27 19:35:48 -0500 |
| commit | 09e4f9029da1b53e835555c353a89c36b71233b0 (patch) | |
| tree | 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc /drivers/video/Kconfig | |
| parent | 750b50ab5687125d8a1dc946d931b00acf016e2c (diff) | |
| parent | dbfedbb98145375106cee7ec7269611d553819dc (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e64ed16bd42f..f5079c78ba4e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -520,7 +520,7 @@ config FB_GBE | |||
| 520 | config FB_GBE_MEM | 520 | config FB_GBE_MEM |
| 521 | int "Video memory size in MB" | 521 | int "Video memory size in MB" |
| 522 | depends on FB_GBE | 522 | depends on FB_GBE |
| 523 | default 8 | 523 | default 4 |
| 524 | help | 524 | help |
| 525 | This is the amount of memory reserved for the framebuffer, | 525 | This is the amount of memory reserved for the framebuffer, |
| 526 | which can be any value between 1MB and 8MB. | 526 | which can be any value between 1MB and 8MB. |