Commit a16ab68e authored by Helge Deller's avatar Helge Deller
Browse files

parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver 



Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent b8d8fccd

arch/parisc/configs/c3000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_NS87415=y

CONFIG_BLK_DEV_SIIMAGE=m

CONFIG_PATA_SIL680=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

arch/parisc/configs/c8000_defconfig

+3 −32
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ CONFIG_IDE=y 
CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_PLATFORM=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_SIIMAGE=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=m
@@ -93,6 +91,8 @@ CONFIG_SCSI_FC_ATTRS=y 
CONFIG_SCSI_SAS_LIBSAS=m

CONFIG_ISCSI_TCP=m

CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_ATA=y

CONFIG_PATA_SIL680=y

CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

CONFIG_FUSION_SAS=y
@@ -113,9 +113,8 @@ CONFIG_INPUT_FF_MEMLESS=m 
# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_KEYBOARD_HIL_OLD is not set

# CONFIG_KEYBOARD_HIL is not set

CONFIG_MOUSE_PS2=m

# CONFIG_MOUSE_PS2 is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_CM109=m

CONFIG_SERIO_SERPORT=m

CONFIG_SERIO_PARKBD=m

CONFIG_SERIO_GSCPS2=m
@@ -166,34 +165,6 @@ CONFIG_SND_VERBOSE_PRINTK=y 
CONFIG_SND_AD1889=m

# CONFIG_SND_USB is not set

# CONFIG_SND_GSC is not set

CONFIG_HID_A4TECH=m

CONFIG_HID_APPLE=m

CONFIG_HID_BELKIN=m

CONFIG_HID_CHERRY=m

CONFIG_HID_CHICONY=m

CONFIG_HID_CYPRESS=m

CONFIG_HID_DRAGONRISE=m

CONFIG_HID_EZKEY=m

CONFIG_HID_KYE=m

CONFIG_HID_GYRATION=m

CONFIG_HID_TWINHAN=m

CONFIG_HID_KENSINGTON=m

CONFIG_HID_LOGITECH=m

CONFIG_HID_LOGITECH_DJ=m

CONFIG_HID_MICROSOFT=m

CONFIG_HID_MONTEREY=m

CONFIG_HID_NTRIG=m

CONFIG_HID_ORTEK=m

CONFIG_HID_PANTHERLORD=m

CONFIG_HID_PETALYNX=m

CONFIG_HID_SAMSUNG=m

CONFIG_HID_SUNPLUS=m

CONFIG_HID_GREENASIA=m

CONFIG_HID_SMARTJOYPLUS=m

CONFIG_HID_TOPSEED=m

CONFIG_HID_THRUSTMASTER=m

CONFIG_HID_ZEROPLUS=m

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

arch/parisc/configs/generic-64bit_defconfig

+4 −34
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ CONFIG_IDE_GD=m 
CONFIG_IDE_GD_ATAPI=y

CONFIG_BLK_DEV_IDECD=m

CONFIG_BLK_DEV_NS87415=y

CONFIG_BLK_DEV_SIIMAGE=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y
@@ -81,6 +80,7 @@ CONFIG_SCSI_ZALON=y 
CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_DH=y

CONFIG_ATA=y

CONFIG_PATA_SIL680=y

CONFIG_ATA_GENERIC=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m
@@ -161,7 +161,7 @@ CONFIG_SLIP_MODE_SLIP6=y 
CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_HIL_OLD is not set

# CONFIG_KEYBOARD_HIL is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_MOUSE_PS2 is not set

CONFIG_INPUT_MISC=y

CONFIG_SERIO_SERPORT=m

# CONFIG_HP_SDC is not set
@@ -215,32 +215,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y 
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_HID_DRAGONRISE=m

CONFIG_DRAGONRISE_FF=y

CONFIG_HID_KYE=m

CONFIG_HID_GYRATION=m

CONFIG_HID_TWINHAN=m

CONFIG_LOGITECH_FF=y

CONFIG_LOGIRUMBLEPAD2_FF=y

CONFIG_HID_NTRIG=m

CONFIG_HID_PANTHERLORD=m

CONFIG_PANTHERLORD_FF=y

CONFIG_HID_PETALYNX=m

CONFIG_HID_SAMSUNG=m

CONFIG_HID_SONY=m

CONFIG_HID_SUNPLUS=m

CONFIG_HID_GREENASIA=m

CONFIG_GREENASIA_FF=y

CONFIG_HID_SMARTJOYPLUS=m

CONFIG_SMARTJOYPLUS_FF=y

CONFIG_HID_TOPSEED=m

CONFIG_HID_THRUSTMASTER=m

CONFIG_THRUSTMASTER_FF=y

CONFIG_HID_ZEROPLUS=m

CONFIG_ZEROPLUS_FF=y

CONFIG_USB_HID=m

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y
@@ -250,13 +225,8 @@ CONFIG_USB_DYNAMIC_MINORS=y 
CONFIG_USB_MON=m

CONFIG_USB_WUSB_CBAF=m

CONFIG_USB_XHCI_HCD=m

CONFIG_USB_EHCI_HCD=m

CONFIG_USB_OHCI_HCD=m

CONFIG_USB_R8A66597_HCD=m

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m

CONFIG_USB_WDM=m

CONFIG_USB_TMC=m

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y