diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /arch/mips/configs/ocelot_3_defconfig | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/mips/configs/ocelot_3_defconfig')
| -rw-r--r-- | arch/mips/configs/ocelot_3_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index ffb23fcab862..f18d05c2ca77 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
| @@ -758,7 +758,6 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 758 | # CONFIG_FB_SMIVGX is not set | 758 | # CONFIG_FB_SMIVGX is not set |
| 759 | # CONFIG_FB_CYBLA is not set | 759 | # CONFIG_FB_CYBLA is not set |
| 760 | # CONFIG_FB_TRIDENT is not set | 760 | # CONFIG_FB_TRIDENT is not set |
| 761 | # CONFIG_FB_E1356 is not set | ||
| 762 | # CONFIG_FB_S1D13XXX is not set | 761 | # CONFIG_FB_S1D13XXX is not set |
| 763 | # CONFIG_FB_VIRTUAL is not set | 762 | # CONFIG_FB_VIRTUAL is not set |
| 764 | 763 | ||