---

yaml --- r: 261175 b: refs/heads/master c: b2987a5 h: refs/heads/master i: 261173: 3a26db2 261171: c6986f1 261167: 113aad6 v: v3
git-mirror · Jul 29, 2011 · 40b9cb5 · 40b9cb5
1 parent d2f4f63
commit 40b9cb5
Show file tree

Hide file tree

Showing 287 changed files with 1,756 additions and 5,096 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c32e7d669ef827f97d1aae8f6b34542665defbf6
+refs/heads/master: b2987a5e05ec7a1af7ca42e5d5349d7a22753031
diff --git a/trunk/Documentation/devicetree/bindings/arm/arm-boards b/trunk/Documentation/devicetree/bindings/arm/arm-boards
diff --git a/trunk/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/trunk/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
diff --git a/trunk/Documentation/devicetree/bindings/i2c/arm-versatile.txt b/trunk/Documentation/devicetree/bindings/i2c/arm-versatile.txt
diff --git a/trunk/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/trunk/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
diff --git a/trunk/Documentation/devicetree/bindings/mtd/arm-versatile.txt b/trunk/Documentation/devicetree/bindings/mtd/arm-versatile.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt b/trunk/Documentation/devicetree/bindings/net/fsl-fec.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/smsc-lan91c111.txt b/trunk/Documentation/devicetree/bindings/net/smsc-lan91c111.txt
diff --git a/trunk/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/trunk/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.txt
diff --git a/trunk/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
diff --git a/trunk/Documentation/watchdog/00-INDEX b/trunk/Documentation/watchdog/00-INDEX
@@ -8,8 +8,6 @@ src/
 	- directory holding watchdog related example programs.
 watchdog-api.txt
 	- description of the Linux Watchdog driver API.
-watchdog-kernel-api.txt
-	- description of the Linux WatchDog Timer Driver Core kernel API.
 watchdog-parameters.txt
 	- information on driver parameters (for drivers other than
 	  the ones that have driver-specific files here)

diff --git a/trunk/Documentation/watchdog/watchdog-kernel-api.txt b/trunk/Documentation/watchdog/watchdog-kernel-api.txt
diff --git a/trunk/arch/alpha/kernel/sys_alcor.c b/trunk/arch/alpha/kernel/sys_alcor.c
@@ -183,7 +183,7 @@ alcor_init_irq(void)
  */
 
 static int __init
-alcor_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+alcor_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 	static char irq_tab[7][5] __initdata = {
 		/*INT    INTA   INTB   INTC   INTD */

diff --git a/trunk/arch/alpha/kernel/sys_cabriolet.c b/trunk/arch/alpha/kernel/sys_cabriolet.c
@@ -175,7 +175,7 @@ pc164_init_irq(void)
  */
 
 static inline int __init
-eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+eb66p_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 	static char irq_tab[5][5] __initdata = {
 		/*INT  INTA  INTB  INTC   INTD */
@@ -205,7 +205,7 @@ eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
  */
 
 static inline int __init
-cabriolet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 	static char irq_tab[5][5] __initdata = {
 		/*INT   INTA  INTB  INTC   INTD */
@@ -289,7 +289,7 @@ cia_cab_init_pci(void)
  */
 
 static inline int __init
-alphapc164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+alphapc164_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
 	static char irq_tab[7][5] __initdata = {
 		/*INT   INTA  INTB   INTC   INTD */