diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /arch/parisc/configs/c3000_defconfig | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/parisc/configs/c3000_defconfig')
| -rw-r--r-- | arch/parisc/configs/c3000_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 9d86b6b1ebd1..0b1c8c1fa8a3 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
| @@ -626,6 +626,7 @@ CONFIG_ACENIC=m | |||
| 626 | # CONFIG_DL2K is not set | 626 | # CONFIG_DL2K is not set |
| 627 | CONFIG_E1000=m | 627 | CONFIG_E1000=m |
| 628 | # CONFIG_E1000_NAPI is not set | 628 | # CONFIG_E1000_NAPI is not set |
| 629 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 629 | # CONFIG_NS83820 is not set | 630 | # CONFIG_NS83820 is not set |
| 630 | # CONFIG_HAMACHI is not set | 631 | # CONFIG_HAMACHI is not set |
| 631 | # CONFIG_YELLOWFIN is not set | 632 | # CONFIG_YELLOWFIN is not set |