diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-13 11:37:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-13 11:37:38 -0700 |
| commit | b174ec2c65d7fa13c88085a04670ac015fd9eb2e (patch) | |
| tree | 83f096a470c050c406f4ff7fab07e4fa7577fd60 /arch/mips/configs/pb1100_defconfig | |
| parent | 8b9909ded6922c33c221b105b26917780cfa497d (diff) | |
| parent | 0e6ee854e7be9f12146c35aa09da3fe366d60f8c (diff) | |
| download | blackbird-op-linux-b174ec2c65d7fa13c88085a04670ac015fd9eb2e.tar.gz blackbird-op-linux-b174ec2c65d7fa13c88085a04670ac015fd9eb2e.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] kspd: ioctl needs a translation entry.
[MIPS] Viper2: Remove defective support.
[MIPS] Oprofile: Reset all performance registers for MIPS_MT_SMP configs
Diffstat (limited to 'arch/mips/configs/pb1100_defconfig')
| -rw-r--r-- | arch/mips/configs/pb1100_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index 33fcc8133bc0..69678d99ae61 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig @@ -39,7 +39,6 @@ CONFIG_MIPS_PB1100=y # CONFIG_MOMENCO_OCELOT_C is not set # CONFIG_MOMENCO_OCELOT_G is not set # CONFIG_MIPS_XXS1500 is not set -# CONFIG_PNX8550_V2PCI is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_DDB5477 is not set |
