Commit c8791088 authored by Russell King's avatar Russell King Committed by Russell King

Merge branch 'omap-rmk'

parents e80d6a24 a8149170
...@@ -4005,7 +4005,7 @@ S: Maintained ...@@ -4005,7 +4005,7 @@ S: Maintained
TI OMAP MMC INTERFACE DRIVER TI OMAP MMC INTERFACE DRIVER
P: Carlos Aguiar, Anderson Briglia and Syed Khasim P: Carlos Aguiar, Anderson Briglia and Syed Khasim
M: linux-omap-open-source@linux.omap.com (subscribers only) M: linux-omap@vger.kernel.org
W: http://linux.omap.com W: http://linux.omap.com
W: http://www.muru.com/linux/omap/ W: http://www.muru.com/linux/omap/
S: Maintained S: Maintained
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -103,7 +103,7 @@ static struct resource sdp2430_smc91x_resources[] = { ...@@ -103,7 +103,7 @@ static struct resource sdp2430_smc91x_resources[] = {
[1] = { [1] = {
.start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
.flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment