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

Commit f8872f4c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm

parents 99baa752 574dc0ab

arch/arm/common/rtctime.c

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc 
		rtc_time_to_tm(next_time, next);

	}

}

EXPORT_SYMBOL(rtc_next_alarm_time);



static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm)

{

arch/arm/mach-ixp4xx/common-pci.c

+0 −2
Original line number Diff line number Diff line
@@ -532,8 +532,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) 
	return -EIO;

}



EXPORT_SYMBOL(pci_set_dma_mask);

EXPORT_SYMBOL(pci_set_consistent_dma_mask);

EXPORT_SYMBOL(ixp4xx_pci_read);

EXPORT_SYMBOL(ixp4xx_pci_write);

arch/arm/mach-ixp4xx/gtwx5715-setup.c

+2 −5
Original line number Diff line number Diff line
@@ -107,9 +107,9 @@ static struct flash_platform_data gtwx5715_flash_data = { 
	.width		= 2,

};



static struct gtw5715_flash_resource = {

static struct resource gtwx5715_flash_resource = {

	.flags		= IORESOURCE_MEM,

}

};



static struct platform_device gtwx5715_flash = {

	.name		= "IXP4XX-Flash",
@@ -130,9 +130,6 @@ static void __init gtwx5715_init(void) 
{

	ixp4xx_sys_init();



	if (!flash_resource)

		printk(KERN_ERR "Could not allocate flash resource\n");



	gtwx5715_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);

	gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;

drivers/scsi/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ comment "The following drivers are not fully supported" 
config SCSI_CUMANA_1

	tristate "CumanaSCSI I support (EXPERIMENTAL)"

	depends on ARCH_ACORN && EXPERIMENTAL && SCSI

	select SCSI_SPI_ATTRS

	help

	  This enables support for the Cumana SCSI I card. If you have an

	  Acorn system with one of these, say Y. If unsure, say N.
@@ -76,6 +77,7 @@ config SCSI_CUMANA_1 
config SCSI_ECOSCSI

	tristate "EcoScsi support (EXPERIMENTAL)"

	depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI

	select SCSI_SPI_ATTRS

	help

	  This enables support for the EcoSCSI card -- a small card that sits

	  in the Econet socket. If you have an Acorn system with one of these,
@@ -84,6 +86,7 @@ config SCSI_ECOSCSI 
config SCSI_OAK1

	tristate "Oak SCSI support (EXPERIMENTAL)"

	depends on ARCH_ACORN && EXPERIMENTAL && SCSI

	select SCSI_SPI_ATTRS

	help

	  This enables support for the Oak SCSI card. If you have an Acorn

	  system with one of these, say Y. If unsure, say N.

drivers/scsi/arm/scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt) 
		unsigned long len = 0;

		int buf;



		SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->buffer;

		SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer;

		SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1;

		SCpnt->SCp.ptr = (char *)

			 (page_address(SCpnt->SCp.buffer->page) +