diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /arch/arm/def-configs | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'arch/arm/def-configs')
| -rw-r--r-- | arch/arm/def-configs/a5k | 10 | ||||
| -rw-r--r-- | arch/arm/def-configs/footbridge | 12 | ||||
| -rw-r--r-- | arch/arm/def-configs/rpc | 11 |
3 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/def-configs/a5k b/arch/arm/def-configs/a5k index b5fd4b315..21a6488eb 100644 --- a/arch/arm/def-configs/a5k +++ b/arch/arm/def-configs/a5k @@ -167,6 +167,11 @@ CONFIG_MOUSE=y # CONFIG_FTAPE is not set # CONFIG_DRM is not set # CONFIG_DRM_TDFX is not set + +# +# PCMCIA character device support +# +# CONFIG_PCMCIA_SERIAL_CS is not set # CONFIG_AGP is not set # @@ -324,6 +329,11 @@ CONFIG_ARM_ETHER3=y # CONFIG_WAN is not set # +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# # SCSI support # # CONFIG_SCSI is not set diff --git a/arch/arm/def-configs/footbridge b/arch/arm/def-configs/footbridge index d68d0b358..e43a8d2a9 100644 --- a/arch/arm/def-configs/footbridge +++ b/arch/arm/def-configs/footbridge @@ -54,6 +54,7 @@ CONFIG_BINFMT_ELF=y CONFIG_PARPORT=y CONFIG_PARPORT_PC=y CONFIG_PARPORT_PC_FIFO=y +# CONFIG_PARPORT_PC_PCMCIA is not set # CONFIG_PARPORT_ARC is not set # CONFIG_PARPORT_AMIGA is not set # CONFIG_PARPORT_MFC3 is not set @@ -264,6 +265,12 @@ CONFIG_VIDEO_CYBERPRO=m # CONFIG_DRM_TDFX is not set # +# PCMCIA character device support +# +# CONFIG_PCMCIA_SERIAL_CS is not set +# CONFIG_AGP is not set + +# # Support for USB # CONFIG_USB=m @@ -497,6 +504,11 @@ CONFIG_SLIP_MODE_SLIP6=y # CONFIG_WAN is not set # +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# # SCSI support # # CONFIG_SCSI is not set diff --git a/arch/arm/def-configs/rpc b/arch/arm/def-configs/rpc index e801bf641..a22e1d992 100644 --- a/arch/arm/def-configs/rpc +++ b/arch/arm/def-configs/rpc @@ -50,6 +50,7 @@ CONFIG_BINFMT_ELF=y CONFIG_PARPORT=y CONFIG_PARPORT_PC=y # CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_PCMCIA is not set # CONFIG_PARPORT_ARC is not set # CONFIG_PARPORT_AMIGA is not set # CONFIG_PARPORT_MFC3 is not set @@ -176,6 +177,11 @@ CONFIG_MOUSE=y # CONFIG_FTAPE is not set # CONFIG_DRM is not set # CONFIG_DRM_TDFX is not set + +# +# PCMCIA character device support +# +# CONFIG_PCMCIA_SERIAL_CS is not set # CONFIG_AGP is not set CONFIG_RPCMOUSE=y @@ -349,6 +355,11 @@ CONFIG_PPP=m # CONFIG_WAN is not set # +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# # SCSI support # CONFIG_SCSI=y |