Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41567
b: refs/heads/master
c: 97be852
h: refs/heads/master
i:
  41565: f77385d
  41563: 1d145ed
  41559: 97ad67e
  41551: c159bff
  41535: 064d851
v: v3
  • Loading branch information
Linus Torvalds committed Dec 2, 2006
1 parent a069246 commit f772417
Show file tree
Hide file tree
Showing 19 changed files with 599 additions and 235 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aae343d493df965ac3abec1bd97cccfe44a7d920
refs/heads/master: 97be852f81c5bb114aab31974af2c061eb86a6de
10 changes: 5 additions & 5 deletions trunk/arch/i386/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
/*
* Parse Interrupt Source Override for the ACPI SCI
*/
static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigger)
static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
{
if (trigger == 0) /* compatible SCI trigger is level */
trigger = 3;
Expand All @@ -353,13 +353,13 @@ static void acpi_sci_ioapic_setup(u32 bus_irq, u32 gsi, u16 polarity, u16 trigge
* If GSI is < 16, this will update its flags,
* else it will create a new mp_irqs[] entry.
*/
mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
mp_override_legacy_irq(gsi, polarity, trigger, gsi);

/*
* stash over-ride to indicate we've been here
* and for later update of acpi_fadt
*/
acpi_sci_override_gsi = bus_irq;
acpi_sci_override_gsi = gsi;
return;
}

Expand All @@ -377,7 +377,7 @@ acpi_parse_int_src_ovr(acpi_table_entry_header * header,
acpi_table_print_madt_entry(header);

if (intsrc->bus_irq == acpi_fadt.sci_int) {
acpi_sci_ioapic_setup(intsrc->bus_irq, intsrc->global_irq,
acpi_sci_ioapic_setup(intsrc->global_irq,
intsrc->flags.polarity,
intsrc->flags.trigger);
return 0;
Expand Down Expand Up @@ -880,7 +880,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
* pretend we got one so we can set the SCI flags.
*/
if (!acpi_sci_override_gsi)
acpi_sci_ioapic_setup(acpi_fadt.sci_int, acpi_fadt.sci_int, 0, 0);
acpi_sci_ioapic_setup(acpi_fadt.sci_int, 0, 0);

/* Fill in identity legacy mapings where no override */
mp_config_acpi_legacy_irqs();
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ config MMC_ARMMMCI
If unsure, say N.

config MMC_PXA
tristate "Intel PXA255 Multimedia Card Interface support"
tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
depends on ARCH_PXA && MMC
help
This selects the Intel(R) PXA(R) Multimedia card Interface.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/at91_mci.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ int at91_mci_get_ro(struct mmc_host *mmc)
return read_only;
}

static struct mmc_host_ops at91_mci_ops = {
static const struct mmc_host_ops at91_mci_ops = {
.request = at91_mci_request,
.set_ios = at91_mci_set_ios,
.get_ro = at91_mci_get_ro,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/au1xmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ static void au1xmmc_init_dma(struct au1xmmc_host *host)
host->rx_chan = rxchan;
}

struct mmc_host_ops au1xmmc_ops = {
struct const mmc_host_ops au1xmmc_ops = {
.request = au1xmmc_request,
.set_ios = au1xmmc_set_ios,
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/imxmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ static void imxmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
}
}

static struct mmc_host_ops imxmci_ops = {
static const struct mmc_host_ops imxmci_ops = {
.request = imxmci_request,
.set_ios = imxmci_set_ios,
};
Expand Down
Loading

0 comments on commit f772417

Please sign in to comment.