---

yaml --- r: 171635 b: refs/heads/master c: f54a520 h: refs/heads/master i: 171633: 8684f88 171631: b296008 v: v3
git-mirror · Nov 11, 2009 · c06ca9e · c06ca9e
1 parent 24c7480
commit c06ca9e
Show file tree

Hide file tree

Showing 164 changed files with 2,723 additions and 5,059 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea31ba359c55e0734ff895692185d4c50cf0c537
+refs/heads/master: f54a52021d7ad039c16fe5a1e094d8f0394d90ec
diff --git a/trunk/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/trunk/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
@@ -178,13 +178,3 @@ External interrupts:
 	external irq3:	interrupts = <1 3 n>;
 'n' is sense (0: level high, 1: edge rising, 2: edge falling 3: level low)
 
-fsl,mpc5200-mscan nodes
------------------------
-In addition to the required compatible-, reg- and interrupt-properites, you can
-also specify which clock source shall be used for the controller:
-
-- fsl,mscan-clock-source- a string describing the clock source. Valid values
-			  are:	"ip" for ip bus clock
-				"ref" for reference clock (XTAL)
-			  "ref" is default in case this property is not
-			  present.
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3704,9 +3704,9 @@ F:	include/linux/if_*
 F:	include/linux/*device.h
 
 NETXEN (1/10) GbE SUPPORT
-M:	Amit Kumar Salecha <amit.salecha@qlogic.com>
+M:	Dhananjay Phadke <dhananjay@netxen.com>
 L:	netdev@vger.kernel.org
-W:	http://www.qlogic.com
+W:	http://www.netxen.com
 S:	Supported
 F:	drivers/net/netxen/
 
@@ -4304,7 +4304,6 @@ F:	drivers/video/aty/aty128fb.c
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:	rt2x00 project
 M:	Ivo van Doorn <IvDoorn@gmail.com>
-M:	Gertjan van Wingerde <gwingerde@gmail.com>
 L:	linux-wireless@vger.kernel.org
 L:	users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:	http://rt2x00.serialmonkey.com/
@@ -4392,7 +4391,7 @@ RFKILL
 M:	Johannes Berg <johannes@sipsolutions.net>
 L:	linux-wireless@vger.kernel.org
 S:	Maintained
-F:	Documentation/rfkill.txt
+F	Documentation/rfkill.txt
 F:	net/rfkill/
 
 RISCOM8 DRIVER

diff --git a/trunk/arch/alpha/include/asm/unistd.h b/trunk/arch/alpha/include/asm/unistd.h
@@ -433,11 +433,10 @@
 #define __NR_signalfd			476
 #define __NR_timerfd			477
 #define __NR_eventfd			478
-#define __NR_recvmmsg			479
 
 #ifdef __KERNEL__
 
-#define NR_SYSCALLS			480
+#define NR_SYSCALLS			479
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR

diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/drivers/atm/solos-pci.c
@@ -531,37 +531,34 @@ static int flash_upgrade(struct solos_card *card, int chip)
 	int numblocks = 0;
 	int offset;
 
-	switch (chip) {
-	case 0:
+	if (chip == 0) {
 		fw_name = "solos-FPGA.bin";
 		blocksize = FPGA_BLOCK;
-		break;
-	case 1:
+	} 
+
+	if (chip == 1) {
 		fw_name = "solos-Firmware.bin";
 		blocksize = SOLOS_BLOCK;
-		break;
-	case 2:
+	}
+
+	if (chip == 2){
 		if (card->fpga_version > LEGACY_BUFFERS){
 			fw_name = "solos-db-FPGA.bin";
 			blocksize = FPGA_BLOCK;
 		} else {
-			dev_info(&card->dev->dev, "FPGA version doesn't support"
-					" daughter board upgrades\n");
+			dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
 			return -EPERM;
 		}
-		break;
-	case 3:
+	}
+
+	if (chip == 3){
 		if (card->fpga_version > LEGACY_BUFFERS){
 			fw_name = "solos-Firmware.bin";
 			blocksize = SOLOS_BLOCK;
 		} else {
-			dev_info(&card->dev->dev, "FPGA version doesn't support"
-					" daughter board upgrades\n");
-			return -EPERM;
+		dev_info(&card->dev->dev, "FPGA version doesn't support daughter board upgrades\n");
+		return -EPERM;
 		}
-		break;
-	default:
-		return -ENODEV;
 	}
 
 	if (request_firmware(&fw, fw_name, &card->dev->dev))

diff --git a/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c b/trunk/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5481,7 +5481,7 @@ HFCmulti_init(void)
 		if (err) {
 			printk(KERN_ERR "error registering embedded driver: "
 				"%x\n", err);
-			return err;
+			return -err;
 		}
 		HFC_cnt++;
 		printk(KERN_INFO "%d devices registered\n", HFC_cnt);