diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 17:05:59 -0400 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /arch/powerpc/configs/maple_defconfig | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/configs/maple_defconfig')
| -rw-r--r-- | arch/powerpc/configs/maple_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 2860be106f4f..62ba66091a13 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
| @@ -496,7 +496,7 @@ CONFIG_E1000=y | |||
| 496 | # CONFIG_SKY2 is not set | 496 | # CONFIG_SKY2 is not set |
| 497 | # CONFIG_SK98LIN is not set | 497 | # CONFIG_SK98LIN is not set |
| 498 | # CONFIG_VIA_VELOCITY is not set | 498 | # CONFIG_VIA_VELOCITY is not set |
| 499 | # CONFIG_TIGON3 is not set | 499 | CONFIG_TIGON3=y |
| 500 | # CONFIG_BNX2 is not set | 500 | # CONFIG_BNX2 is not set |
| 501 | # CONFIG_MV643XX_ETH is not set | 501 | # CONFIG_MV643XX_ETH is not set |
| 502 | 502 | ||