SVN-Revision: 7275
@ -25,7 +25,7 @@ endif
ifneq ($(CONFIG_USB),)
FEATURES += usb
endif
ifneq ($(CONFIG_PCMCIA),)
ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
FEATURES += pcmcia
ifneq ($(CONFIG_VIDEO_DEV),)
@ -195,6 +195,8 @@ CONFIG_PARPORT=m
# CONFIG_PARPORT_PC is not set
CONFIG_PARPORT_SPLINK=m
# CONFIG_PARPORT_SUNBPP is not set
CONFIG_PCCARD=m
CONFIG_PCCARD_NONSTATIC=m
CONFIG_PCI=y
CONFIG_PCI_AUTO=y
# CONFIG_PCI_HERMES is not set
@ -739,8 +739,6 @@ CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
# CONFIG_PARPORT is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PCI_ATMEL=m
CONFIG_PCI_HERMES=m
@ -337,6 +337,8 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
CONFIG_PC8736x_GPIO=m
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_BIOS=y