diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-20 03:59:41 -0500 |
|---|---|---|
| committer | Steven Whitehouse <steve@chygwyn.com> | 2006-01-20 03:59:41 -0500 |
| commit | 044399b2cb6ad2d7f63cfca945268853d7443a4d (patch) | |
| tree | 5f96eb307b0389ac0b919a4744a40862b615e9da /arch/i386/defconfig | |
| parent | 901359256b2666f52a3a7d3f31927677e91b3a2a (diff) | |
| parent | 18a4144028f056b77d6576d4eb284246e9c7ea97 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/defconfig')
| -rw-r--r-- | arch/i386/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 6a431b926019..3cbe6e9cb9fc 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -644,6 +644,8 @@ CONFIG_8139TOO_PIO=y | |||
| 644 | # CONFIG_ACENIC is not set | 644 | # CONFIG_ACENIC is not set |
| 645 | # CONFIG_DL2K is not set | 645 | # CONFIG_DL2K is not set |
| 646 | # CONFIG_E1000 is not set | 646 | # CONFIG_E1000 is not set |
| 647 | # CONFIG_E1000_NAPI is not set | ||
| 648 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 647 | # CONFIG_NS83820 is not set | 649 | # CONFIG_NS83820 is not set |
| 648 | # CONFIG_HAMACHI is not set | 650 | # CONFIG_HAMACHI is not set |
| 649 | # CONFIG_YELLOWFIN is not set | 651 | # CONFIG_YELLOWFIN is not set |