diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 6a094b69e7260e920996ac649c6c10140a1e1be4..d5715505f02bed54c7a3a31385f3495a3fbf257b 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -100,14 +100,13 @@ CONFIG_PARPORT_1284=y CONFIG_PRINTER=m CONFIG_ENVCTRL=m CONFIG_DISPLAY7SEG=m -CONFIG_WATCHDOG_CP1XXX=m -CONFIG_WATCHDOG_RIO=m # CONFIG_CMDLINE_BOOL is not set # # Generic Driver Options # CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set # # Graphics support @@ -211,7 +210,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set -CONFIG_DCSSBLK=m # # ATA/ATAPI/MFM/RLL support @@ -407,6 +405,8 @@ CONFIG_IEEE1394=m # # CONFIG_IEEE1394_VERBOSEDEBUG is not set CONFIG_IEEE1394_OUI_DB=y +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # # Device Drivers @@ -1638,6 +1638,8 @@ CONFIG_WATCHDOG=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_WATCHDOG_CP1XXX=m +CONFIG_WATCHDOG_RIO=m # # PCI-based Watchdog Cards @@ -1646,6 +1648,11 @@ CONFIG_PCIPCWATCHDOG=m CONFIG_WDTPCI=m CONFIG_WDT_501_PCI=y +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m + # # Profiling support # diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 7998eae7da40a5b46b3411e4376262261427642f..61462b0474197ca315997e4fe14bfa78857e7a70 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h @@ -461,7 +461,6 @@ asmlinkage unsigned long sys_mmap2( unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); -asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on); struct sigaction; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,