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

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC] uctrl: Check request_irq() return value.
  [SPARC64]: Update defconfig.
  [SPARC64] bbc_i2c: Fix kenvctrld eating %100 cpu.
  [SPARC64]: Fix arch_teardown_msi_irq().
  [SPARC64]: virt_irq_free only needed when CONFIG_PCI_MSI
  [SPARC]: Remove the broken SUN_AURORA driver.
parents 6842ac64 19ba1b19

Documentation/magic-number.txt

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ CMAGIC 0x0111 user include/linux/a.out.h 
MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h

RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h

SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h

AURORA_MAGIC          0x0A18      Aurora_port       drivers/sbus/char/aurora.h

HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c

APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c

CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h

arch/sparc64/defconfig

+24 −4
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20

# Sun Feb 11 23:47:40 2007

# Linux kernel version: 2.6.21-rc1

# Mon Feb 26 10:45:21 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -41,6 +41,7 @@ CONFIG_LOCALVERSION="" 
CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set
@@ -322,6 +323,7 @@ CONFIG_CONNECTOR=m 
#

# Plug and Play support

#

# CONFIG_PNPACPI is not set



#

# Block devices
@@ -787,6 +789,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PASEMI is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_I2C_SIS5595 is not set
@@ -833,6 +836,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set
@@ -873,6 +877,11 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices

#
@@ -887,16 +896,22 @@ CONFIG_HWMON=y 
#

# Graphics support

#

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

CONFIG_FB_DDC=y

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y



#

# Frambuffer hardware drivers

#

# CONFIG_FB_CIRRUS is not set

# CONFIG_FB_PM2 is not set

# CONFIG_FB_ASILIANT is not set
@@ -908,9 +923,11 @@ CONFIG_FB_TILEBLITTING=y 
# CONFIG_FB_MATROX is not set

CONFIG_FB_RADEON=y

CONFIG_FB_RADEON_I2C=y

# CONFIG_FB_RADEON_BACKLIGHT is not set

# CONFIG_FB_RADEON_DEBUG is not set

# CONFIG_FB_ATY128 is not set

# CONFIG_FB_ATY is not set

# CONFIG_FB_S3 is not set

# CONFIG_FB_SAVAGE is not set

# CONFIG_FB_SIS is not set

# CONFIG_FB_NEOMAGIC is not set
@@ -947,7 +964,6 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_LOGO_SUN_CLUT224=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound
@@ -1192,6 +1208,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_BERRY_CHARGE is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set
@@ -1445,9 +1462,11 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_LOG_BUF_SHIFT=18

CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_SCHEDSTATS=y

# CONFIG_TIMER_STATS is not set

# CONFIG_DEBUG_SLAB is not set

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set
@@ -1465,6 +1484,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_DCFLUSH is not set

# CONFIG_STACK_DEBUG is not set

arch/sparc64/kernel/irq.c

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static unsigned char virt_irq_alloc(unsigned int real_irq) 
	return ent;

}



#ifdef CONFIG_PCI_MSI

static void virt_irq_free(unsigned int virt_irq)

{

	unsigned int real_irq;
@@ -121,6 +122,7 @@ static void virt_irq_free(unsigned int virt_irq) 


	__bucket(real_irq)->virt_irq = 0;

}

#endif



static unsigned int virt_to_real_irq(unsigned char virt_irq)

{

arch/sparc64/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) 


void arch_teardown_msi_irq(unsigned int virt_irq)

{

	struct msi_desc *entry = get_irq_data(virt_irq);

	struct msi_desc *entry = get_irq_msi(virt_irq);

	struct pci_dev *pdev = entry->dev;

	struct pcidev_cookie *pcp = pdev->sysdata;

	struct pci_pbm_info *pbm = pcp->pbm;

drivers/sbus/char/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -46,13 +46,6 @@ config SUN_VIDEOPIX 
	  based on the Phillips SAA9051, can handle NTSC and PAL/SECAM and

	  SVIDEO signals.



config SUN_AURORA

	tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"

	depends on EXPERIMENTAL && BROKEN

	help

	  The Aurora Multiboard is a multi-port high-speed serial controller.

	  If you have one of these, say Y.



config TADPOLE_TS102_UCTRL

	tristate "Tadpole TS102 Microcontroller support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && SPARC32

CRA Git | Maintained and supported by SUSTech CRA and CCSE