Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
This commit is contained in:
commit
f8872f4cb4
5 changed files with 7 additions and 8 deletions
|
@ -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);
|
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)
|
static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm)
|
||||||
{
|
{
|
||||||
|
|
|
@ -532,8 +532,6 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL(pci_set_dma_mask);
|
|
||||||
EXPORT_SYMBOL(pci_set_consistent_dma_mask);
|
|
||||||
EXPORT_SYMBOL(ixp4xx_pci_read);
|
EXPORT_SYMBOL(ixp4xx_pci_read);
|
||||||
EXPORT_SYMBOL(ixp4xx_pci_write);
|
EXPORT_SYMBOL(ixp4xx_pci_write);
|
||||||
|
|
||||||
|
|
|
@ -107,9 +107,9 @@ static struct flash_platform_data gtwx5715_flash_data = {
|
||||||
.width = 2,
|
.width = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct gtw5715_flash_resource = {
|
static struct resource gtwx5715_flash_resource = {
|
||||||
.flags = IORESOURCE_MEM,
|
.flags = IORESOURCE_MEM,
|
||||||
}
|
};
|
||||||
|
|
||||||
static struct platform_device gtwx5715_flash = {
|
static struct platform_device gtwx5715_flash = {
|
||||||
.name = "IXP4XX-Flash",
|
.name = "IXP4XX-Flash",
|
||||||
|
@ -130,9 +130,6 @@ static void __init gtwx5715_init(void)
|
||||||
{
|
{
|
||||||
ixp4xx_sys_init();
|
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.start = IXP4XX_EXP_BUS_BASE(0);
|
||||||
gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
|
gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,7 @@ comment "The following drivers are not fully supported"
|
||||||
config SCSI_CUMANA_1
|
config SCSI_CUMANA_1
|
||||||
tristate "CumanaSCSI I support (EXPERIMENTAL)"
|
tristate "CumanaSCSI I support (EXPERIMENTAL)"
|
||||||
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
|
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
|
||||||
|
select SCSI_SPI_ATTRS
|
||||||
help
|
help
|
||||||
This enables support for the Cumana SCSI I card. If you have an
|
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.
|
Acorn system with one of these, say Y. If unsure, say N.
|
||||||
|
@ -76,6 +77,7 @@ config SCSI_CUMANA_1
|
||||||
config SCSI_ECOSCSI
|
config SCSI_ECOSCSI
|
||||||
tristate "EcoScsi support (EXPERIMENTAL)"
|
tristate "EcoScsi support (EXPERIMENTAL)"
|
||||||
depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
|
depends on ARCH_ACORN && EXPERIMENTAL && (ARCH_ARC || ARCH_A5K) && SCSI
|
||||||
|
select SCSI_SPI_ATTRS
|
||||||
help
|
help
|
||||||
This enables support for the EcoSCSI card -- a small card that sits
|
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,
|
in the Econet socket. If you have an Acorn system with one of these,
|
||||||
|
@ -84,6 +86,7 @@ config SCSI_ECOSCSI
|
||||||
config SCSI_OAK1
|
config SCSI_OAK1
|
||||||
tristate "Oak SCSI support (EXPERIMENTAL)"
|
tristate "Oak SCSI support (EXPERIMENTAL)"
|
||||||
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
|
depends on ARCH_ACORN && EXPERIMENTAL && SCSI
|
||||||
|
select SCSI_SPI_ATTRS
|
||||||
help
|
help
|
||||||
This enables support for the Oak SCSI card. If you have an Acorn
|
This enables support for the Oak SCSI card. If you have an Acorn
|
||||||
system with one of these, say Y. If unsure, say N.
|
system with one of these, say Y. If unsure, say N.
|
||||||
|
|
|
@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt)
|
||||||
unsigned long len = 0;
|
unsigned long len = 0;
|
||||||
int buf;
|
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.buffers_residual = SCpnt->use_sg - 1;
|
||||||
SCpnt->SCp.ptr = (char *)
|
SCpnt->SCp.ptr = (char *)
|
||||||
(page_address(SCpnt->SCp.buffer->page) +
|
(page_address(SCpnt->SCp.buffer->page) +
|
||||||
|
|
Reference in a new issue