Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21806261 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: Update defconfigs.
  sh64: fix dma_cache_sync() compilation
  sh64: Move DMA macros from pci.h to scatterlist.h.
parents 5c27d0f1 dd3aa7cd

arch/sh64/configs/cayman_defconfig

+65 −75
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc8

# Tue Oct  9 15:37:16 2007

# Linux kernel version: 2.6.24-rc1

# Fri Nov  2 14:35:27 2007

#

CONFIG_SUPERH=y

CONFIG_SUPERH64=y
@@ -36,6 +36,10 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

# CONFIG_BLK_DEV_INITRD is not set
@@ -148,6 +152,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0
@@ -160,10 +165,6 @@ CONFIG_PCI=y 
CONFIG_SH_PCIDMA_NONCOHERENT=y

# CONFIG_ARCH_SUPPORTS_MSI is not set

# CONFIG_PCI_DEBUG is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set
@@ -209,6 +210,7 @@ CONFIG_IP_PNP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -234,10 +236,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -266,6 +264,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set
@@ -333,6 +332,7 @@ CONFIG_SCSI_SPI_ATTRS=y 
# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set

# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -370,14 +370,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y 
# CONFIG_SCSI_SRP is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set



#

# Fusion MPT device support

#

# CONFIG_FUSION is not set

# CONFIG_FUSION_SPI is not set

# CONFIG_FUSION_FC is not set

# CONFIG_FUSION_SAS is not set



#

# IEEE 1394 (FireWire) support
@@ -392,6 +385,8 @@ CONFIG_NETDEVICES=y 
# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_IP1000 is not set

# CONFIG_ARCNET is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y
@@ -402,6 +397,7 @@ CONFIG_NET_ETHERNET=y 
# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_SMC91X is not set

# CONFIG_SMC911X is not set

CONFIG_NET_TULIP=y

# CONFIG_DE2104X is not set

CONFIG_TULIP=y
@@ -413,13 +409,16 @@ CONFIG_TULIP=y 
# CONFIG_DM9102 is not set

# CONFIG_ULI526X is not set

# CONFIG_HP100 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set

# CONFIG_ADAPTEC_STARFIRE is not set

# CONFIG_B44 is not set

# CONFIG_FORCEDETH is not set

# CONFIG_DGRS is not set

# CONFIG_EEPRO100 is not set

# CONFIG_E100 is not set

# CONFIG_FEALNX is not set
@@ -437,6 +436,7 @@ CONFIG_NETDEV_1000=y 
# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

# CONFIG_E1000 is not set

# CONFIG_E1000E is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -453,11 +453,14 @@ CONFIG_NETDEV_1000=y 
CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_NIU is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_TR is not set



#
@@ -493,7 +496,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set
@@ -561,23 +563,9 @@ CONFIG_UNIX98_PTYS=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set

CONFIG_HW_RANDOM=y

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

CONFIG_DEVPORT=y
@@ -644,8 +632,6 @@ CONFIG_I2C_BOARDINFO=y 
# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set
@@ -653,12 +639,12 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set
@@ -694,6 +680,25 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set



#

# PCI-based Watchdog Cards

#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers
@@ -713,11 +718,11 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y 
# CONFIG_VIDEO_VIVI is not set

# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_TUNER_TEA5761 is not set

# CONFIG_VIDEO_SAA7134 is not set

# CONFIG_VIDEO_HEXIUM_ORION is not set

# CONFIG_VIDEO_HEXIUM_GEMINI is not set

# CONFIG_VIDEO_CX88 is not set

# CONFIG_VIDEO_CX23885 is not set

# CONFIG_VIDEO_CAFE_CCIC is not set

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_DVB_CORE=y
@@ -796,6 +801,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y 
# CONFIG_DVB_OR51132 is not set

# CONFIG_DVB_BCM3510 is not set

# CONFIG_DVB_LGDT330X is not set

# CONFIG_DVB_S5H1409 is not set



#

# Tuners/PLL support
@@ -805,6 +811,9 @@ CONFIG_DVB_CAPTURE_DRIVERS=y 
# CONFIG_DVB_TDA827X is not set

# CONFIG_DVB_TUNER_QT1010 is not set

# CONFIG_DVB_TUNER_MT2060 is not set

# CONFIG_DVB_TUNER_MT2266 is not set

# CONFIG_DVB_TUNER_MT2131 is not set

# CONFIG_DVB_TUNER_DIB0070 is not set



#

# Miscellaneous devices
@@ -817,12 +826,7 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_DRM is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_FB=y
@@ -831,6 +835,7 @@ CONFIG_FIRMWARE_EDID=y 
CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -869,6 +874,12 @@ CONFIG_FB_KYRO=y 
# CONFIG_FB_ARK is not set

# CONFIG_FB_PM3 is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support
@@ -903,6 +914,7 @@ CONFIG_LOGO_SUPERH_CLUT224=y 
CONFIG_HID_SUPPORT=y

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set

# CONFIG_HIDRAW is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -922,19 +934,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_INFINIBAND is not set

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# Userspace I/O

#
@@ -994,7 +993,6 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -1013,10 +1011,7 @@ CONFIG_RAMFS=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -1058,26 +1053,17 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set

# CONFIG_SYSV68_PARTITION is not set



#

# Native Language Support

#

# CONFIG_NLS is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -1101,10 +1087,13 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_EARLY_PRINTK is not set

CONFIG_SH64_PROC_TLB=y

CONFIG_SH64_PROC_ASIDS=y
@@ -1118,6 +1107,7 @@ CONFIG_SH64_SR_WATCH=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set



#

arch/sh64/configs/harp_defconfig

+47 −58
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc8

# Mon Oct  1 18:01:38 2007

# Linux kernel version: 2.6.24-rc1

# Fri Nov  2 14:35:57 2007

#

CONFIG_SUPERH=y

CONFIG_SUPERH64=y
@@ -36,6 +36,10 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

# CONFIG_BLK_DEV_INITRD is not set
@@ -141,6 +145,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0
@@ -150,10 +155,6 @@ CONFIG_NR_QUICK=1 
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)

#

# CONFIG_ARCH_SUPPORTS_MSI is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#
@@ -198,6 +199,7 @@ CONFIG_IP_PNP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -223,10 +225,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -255,6 +253,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set
@@ -314,6 +313,7 @@ CONFIG_SCSI_SPI_ATTRS=y 
# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set

# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_DEBUG is not set
@@ -326,11 +326,18 @@ CONFIG_NETDEVICES=y 
# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

# CONFIG_STNIC is not set

# CONFIG_SMC91X is not set

# CONFIG_SMC911X is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y
@@ -364,7 +371,6 @@ CONFIG_INPUT_MOUSEDEV=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set
@@ -410,13 +416,6 @@ CONFIG_UNIX98_PTYS=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_HW_RANDOM=y

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set
@@ -432,9 +431,8 @@ CONFIG_HW_RANDOM=y 
# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set
@@ -444,6 +442,19 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers
@@ -460,12 +471,6 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_FB=y
@@ -474,6 +479,7 @@ CONFIG_FIRMWARE_EDID=y 
# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -490,6 +496,12 @@ CONFIG_FB_MODE_HELPERS=y 
#

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support
@@ -524,6 +536,7 @@ CONFIG_LOGO_SUPERH_CLUT224=y 
CONFIG_HID_SUPPORT=y

CONFIG_HID=y

# CONFIG_HID_DEBUG is not set

# CONFIG_HIDRAW is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -542,19 +555,6 @@ CONFIG_USB_ARCH_HAS_HCD=y 
# CONFIG_NEW_LEDS is not set

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# Userspace I/O

#
@@ -614,7 +614,6 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -633,10 +632,7 @@ CONFIG_RAMFS=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -678,26 +674,17 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set

# CONFIG_SYSV68_PARTITION is not set



#

# Native Language Support

#

# CONFIG_NLS is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -721,16 +708,17 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_EARLY_PRINTK is not set

# CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set

CONFIG_SH64_PROC_TLB=y

CONFIG_SH64_PROC_ASIDS=y

CONFIG_SH64_SR_WATCH=y

# CONFIG_POOR_MANS_STRACE is not set

# CONFIG_SH_ALPHANUMERIC is not set

# CONFIG_SH_NO_BSS_INIT is not set



#
@@ -738,6 +726,7 @@ CONFIG_SH64_SR_WATCH=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set



#

arch/sh64/configs/sim_defconfig

+30 −38
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc8

# Mon Oct  1 17:50:35 2007

# Linux kernel version: 2.6.24-rc1

# Fri Nov  2 14:36:08 2007

#

CONFIG_SUPERH=y

CONFIG_SUPERH64=y
@@ -33,6 +33,10 @@ CONFIG_SWAP=y 
# CONFIG_USER_NS is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

# CONFIG_BLK_DEV_INITRD is not set
@@ -138,6 +142,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=0
@@ -147,10 +152,6 @@ CONFIG_NR_QUICK=1 
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)

#

# CONFIG_ARCH_SUPPORTS_MSI is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#
@@ -171,6 +172,7 @@ CONFIG_BINFMT_ELF=y 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set
@@ -217,6 +219,7 @@ CONFIG_SCSI_MULTI_LUN=y 
CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set

# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_SCSI_DEBUG is not set

# CONFIG_ATA is not set
@@ -238,7 +241,6 @@ CONFIG_INPUT_MOUSEDEV=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set
@@ -283,7 +285,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set
@@ -298,6 +299,13 @@ CONFIG_UNIX98_PTYS=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers
@@ -313,12 +321,6 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=y

CONFIG_FB=y
@@ -327,6 +329,7 @@ CONFIG_FIRMWARE_EDID=y 
# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -343,6 +346,12 @@ CONFIG_FB_MODE_HELPERS=y 
#

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support
@@ -380,19 +389,6 @@ CONFIG_LOGO_SUPERH_CLUT224=y 
# CONFIG_NEW_LEDS is not set

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# Userspace I/O

#
@@ -451,7 +447,6 @@ CONFIG_TMPFS=y 
# CONFIG_TMPFS_POSIX_ACL is not set

CONFIG_HUGETLBFS=y

CONFIG_HUGETLB_PAGE=y

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -492,22 +487,17 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_KARMA_PARTITION is not set

# CONFIG_EFI_PARTITION is not set

# CONFIG_SYSV68_PARTITION is not set



#

# Native Language Support

#

# CONFIG_NLS is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

CONFIG_PROFILING=y

# CONFIG_OPROFILE is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set
@@ -531,16 +521,17 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FRAME_POINTER=y

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_EARLY_PRINTK is not set

# CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set

CONFIG_SH64_PROC_TLB=y

CONFIG_SH64_PROC_ASIDS=y

CONFIG_SH64_SR_WATCH=y

# CONFIG_POOR_MANS_STRACE is not set

# CONFIG_SH_ALPHANUMERIC is not set

CONFIG_SH_NO_BSS_INIT=y



#
@@ -548,6 +539,7 @@ CONFIG_SH_NO_BSS_INIT=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set



#

include/asm-sh64/dma-mapping.h

+3 −2
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

				  enum dma_data_direction dir)

{

	unsigned long s = (unsigned long) vaddr & L1_CACHE_ALIGN_MASK;

	unsigned long e = (vaddr + size) & L1_CACHE_ALIGN_MASK;

	unsigned long start = (unsigned long) vaddr;

	unsigned long s = start & L1_CACHE_ALIGN_MASK;

	unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;



	for (; s <= e; s += L1_CACHE_BYTES)

		asm volatile ("ocbp	%0, 0" : : "r" (s));

include/asm-sh64/pci.h

+0 −9
Original line number Diff line number Diff line
@@ -72,15 +72,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)

#endif



/* These macros should be used after a pci_map_sg call has been done

 * to get bus addresses of each of the SG entries and their lengths.

 * You should only work with the number of sg entries pci_map_sg

 * returns, or alternatively stop on the first sg_dma_len(sg) which

 * is 0.

 */

#define sg_dma_address(sg)	((sg)->dma_address)

#define sg_dma_len(sg)		((sg)->length)



#ifdef CONFIG_PCI

static inline void pci_dma_burst_advice(struct pci_dev *pdev,

					enum pci_dma_burst_strategy *strat,