---

yaml --- r: 84424 b: refs/heads/master c: 5bb983b h: refs/heads/master v: v3
git-mirror · Feb 8, 2008 · f5227ea · f5227ea
1 parent cfa0b99
commit f5227ea
Show file tree

Hide file tree

Showing 150 changed files with 10,584 additions and 8,805 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8b6de16d9434405e5832b8772e4f986ddd5118e
+refs/heads/master: 5bb983b0cce9b7b281af15730f7019116dd42568
diff --git a/trunk/Documentation/DocBook/scsi.tmpl b/trunk/Documentation/DocBook/scsi.tmpl
@@ -12,7 +12,7 @@
         <surname>Bottomley</surname>
         <affiliation>
           <address>
-            <email>James.Bottomley@hansenpartnership.com</email>
+            <email>James.Bottomley@steeleye.com</email>
           </address>
         </affiliation>
       </author>

diff --git a/trunk/Documentation/input/input-programming.txt b/trunk/Documentation/input/input-programming.txt
@@ -22,7 +22,7 @@ static struct input_dev *button_dev;
 
 static void button_interrupt(int irq, void *dummy, struct pt_regs *fp)
 {
-	input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);
+	input_report_key(button_dev, BTN_1, inb(BUTTON_PORT) & 1);
 	input_sync(button_dev);
 }
 

diff --git a/trunk/Documentation/scsi/ChangeLog.arcmsr b/trunk/Documentation/scsi/ChangeLog.arcmsr
@@ -68,45 +68,4 @@
 **						2. modify the arcmsr_pci_slot_reset function
 **						3. modify the arcmsr_pci_ers_disconnect_forepart function
 **						4. modify the arcmsr_pci_ers_need_reset_forepart function
-** 1.20.00.15   09/27/2007	 Erich Chen & Nick Cheng
-**						1. add arcmsr_enable_eoi_mode() on adapter Type B
-** 						2. add readl(reg->iop2drv_doorbell_reg) in arcmsr_handle_hbb_isr()
-**						in case of the doorbell interrupt clearance is cached
-** 1.20.00.15   10/01/2007	 Erich Chen & Nick Cheng
-**						1. modify acb->devstate[i][j]
-**						as ARECA_RAID_GOOD instead of
-**						ARECA_RAID_GONE in arcmsr_alloc_ccb_pool
-** 1.20.00.15   11/06/2007       Erich Chen & Nick Cheng
-**						1. add conditional declaration for
-** 						arcmsr_pci_error_detected() and
-**						arcmsr_pci_slot_reset
-** 1.20.00.15	11/23/2007       Erich Chen & Nick Cheng
-**						1.check if the sg list member number
-**						exceeds arcmsr default limit in arcmsr_build_ccb()
-**						2.change the returned value type of arcmsr_build_ccb()
-**						from "void" to "int"
-**						3.add the conditional check if arcmsr_build_ccb()
-**						returns FAILED
-** 1.20.00.15	12/04/2007	 Erich Chen & Nick Cheng
-**						1. modify arcmsr_drain_donequeue() to ignore unknown
-**						command and let kernel process command timeout.
-**						This could handle IO request violating max. segments
-**						while Linux XFS over DM-CRYPT.
-**						Thanks to Milan Broz's comments <mbroz@redhat.com>
-** 1.20.00.15	12/24/2007	 Erich Chen & Nick Cheng
-**						1.fix the portability problems
-**						2.fix type B where we should _not_ iounmap() acb->pmu;
-**						it's not ioremapped.
-**						3.add return -ENOMEM if ioremap() fails
-**						4.transfer IS_SG64_ADDR w/ cpu_to_le32()
-**						in arcmsr_build_ccb
-**						5. modify acb->devstate[i][j] as ARECA_RAID_GONE instead of
-**						ARECA_RAID_GOOD in arcmsr_alloc_ccb_pool()
-**						6.fix arcmsr_cdb->Context as (unsigned long)arcmsr_cdb
-**						7.add the checking state of
-**						(outbound_intstatus & ARCMSR_MU_OUTBOUND_HANDLE_INT) == 0
-**						in arcmsr_handle_hba_isr
-**						8.replace pci_alloc_consistent()/pci_free_consistent() with kmalloc()/kfree() in arcmsr_iop_message_xfer()
-**						9. fix the release of dma memory for type B in arcmsr_free_ccb_pool()
-**						10.fix the arcmsr_polling_hbb_ccbdone()
 **************************************************************************
diff --git a/trunk/Documentation/scsi/scsi_mid_low_api.txt b/trunk/Documentation/scsi/scsi_mid_low_api.txt
@@ -1407,7 +1407,7 @@ Credits
 =======
 The following people have contributed to this document:
         Mike Anderson <andmike at us dot ibm dot com>
-        James Bottomley <James dot Bottomley at hansenpartnership dot com>
+        James Bottomley <James dot Bottomley at steeleye dot com> 
         Patrick Mansfield <patmans at us dot ibm dot com> 
         Christoph Hellwig <hch at infradead dot org>
         Doug Ledford <dledford at redhat dot com>

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2150,14 +2150,6 @@ M:	acme@ghostprotocols.net
 L:	netdev@vger.kernel.org
 S:	Maintained
 
-IPWIRELES DRIVER
-P:	Jiri Kosina
-M:	jkosina@suse.cz
-P:	David Sterba
-M:	dsterba@suse.cz
-S:	Maintained
-T:	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-
 IRDA SUBSYSTEM
 P:	Samuel Ortiz
 M:	samuel@sortiz.org

diff --git a/trunk/arch/arm/mach-pxa/tosa.c b/trunk/arch/arm/mach-pxa/tosa.c
@@ -21,8 +21,6 @@
 #include <linux/mmc/host.h>
 #include <linux/pm.h>
 #include <linux/delay.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -248,46 +246,6 @@ static struct platform_device tosakbd_device = {
 	.id		= -1,
 };
 
-static struct gpio_keys_button tosa_gpio_keys[] = {
-	{
-		.type	= EV_PWR,
-		.code	= KEY_SUSPEND,
-		.gpio	= TOSA_GPIO_ON_KEY,
-		.desc	= "On key",
-		.wakeup	= 1,
-		.active_low = 1,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= TOSA_KEY_RECORD,
-		.gpio	= TOSA_GPIO_RECORD_BTN,
-		.desc	= "Record Button",
-		.wakeup	= 1,
-		.active_low = 1,
-	},
-	{
-		.type	= EV_KEY,
-		.code	= TOSA_KEY_SYNC,
-		.gpio	= TOSA_GPIO_SYNC,
-		.desc	= "Sync Button",
-		.wakeup	= 1,
-		.active_low = 1,
-	},
-};
-
-static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = {
-	.buttons	= tosa_gpio_keys,
-	.nbuttons	= ARRAY_SIZE(tosa_gpio_keys),
-};
-
-static struct platform_device tosa_gpio_keys_device = {
-	.name	= "gpio-keys",
-	.id	= -1,
-	.dev	= {
-		.platform_data	= &tosa_gpio_keys_platform_data,
-	},
-};
-
 /*
  * Tosa LEDs
  */
@@ -300,7 +258,6 @@ static struct platform_device *devices[] __initdata = {
 	&tosascoop_device,
 	&tosascoop_jc_device,
 	&tosakbd_device,
-	&tosa_gpio_keys_device,
 	&tosaled_device,
 };
 

diff --git a/trunk/arch/m68k/kernel/process.c b/trunk/arch/m68k/kernel/process.c
@@ -335,7 +335,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
 	if (dump->start_stack < TASK_SIZE)
 		dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
 
-	dump->u_ar0 = offsetof(struct user, regs);
+	dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
 	sw = ((struct switch_stack *)regs) - 1;
 	dump->regs.d1 = regs->d1;
 	dump->regs.d2 = regs->d2;

diff --git a/trunk/arch/powerpc/kernel/asm-offsets.c b/trunk/arch/powerpc/kernel/asm-offsets.c
@@ -313,7 +313,7 @@ int main(void)
 	DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
 	DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
 	DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
-	DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
+	DEFINE(CLOCK_REALTIME_RES, (KTIME_MONOTONIC_RES).tv64);
 
 #ifdef CONFIG_BUG
 	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));

diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c
@@ -292,8 +292,7 @@ firmware_class_timeout(u_long data)
 
 static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
 {
-	/* XXX warning we should watch out for name collisions */
-	strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
+	snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
 }
 
 static int fw_register_device(struct device **dev_p, const char *fw_name,

diff --git a/trunk/drivers/char/drm/i915_drv.h b/trunk/drivers/char/drm/i915_drv.h
@@ -187,7 +187,7 @@ typedef struct drm_i915_private {
 	u32 saveSWF2[3];
 	u8 saveMSR;
 	u8 saveSR[8];
-	u8 saveGR[25];
+	u8 saveGR[24];
 	u8 saveAR_INDEX;
 	u8 saveAR[20];
 	u8 saveDACMASK;

diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c
@@ -38,6 +38,7 @@
 #include <linux/kbd_kern.h>
 #include <linux/kbd_diacr.h>
 #include <linux/vt_kern.h>
+#include <linux/consolemap.h>
 #include <linux/sysrq.h>
 #include <linux/input.h>
 #include <linux/reboot.h>
@@ -193,7 +194,7 @@ int getkeycode(unsigned int scancode)
 	int error = -ENODEV;
 
 	list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
-		error = input_get_keycode(handle->dev, scancode, &keycode);
+		error = handle->dev->getkeycode(handle->dev, scancode, &keycode);
 		if (!error)
 			return keycode;
 	}
@@ -207,7 +208,7 @@ int setkeycode(unsigned int scancode, unsigned int keycode)
 	int error = -ENODEV;
 
 	list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
-		error = input_set_keycode(handle->dev, scancode, keycode);
+		error = handle->dev->setkeycode(handle->dev, scancode, keycode);
 		if (!error)
 			break;
 	}

diff --git a/trunk/drivers/char/pcmcia/Kconfig b/trunk/drivers/char/pcmcia/Kconfig
@@ -43,14 +43,5 @@ config CARDMAN_4040
 	  (http://www.omnikey.com/), or a current development version of OpenCT
 	  (http://www.opensc.org/).
 
-config IPWIRELESS
-	tristate "IPWireless 3G UMTS PCMCIA card support"
-	depends on PCMCIA
-	select PPP
-	help
-	  This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
-	  some countries (for example Czech Republic, T-Mobile ISP) this card
-	  is shipped for service called UMTS 4G.
-
 endmenu
 
diff --git a/trunk/drivers/char/pcmcia/Makefile b/trunk/drivers/char/pcmcia/Makefile
@@ -4,8 +4,6 @@
 # Makefile for the Linux PCMCIA char device drivers.
 #
 
-obj-y += ipwireless/
-
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
 obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o
 obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o
diff --git a/trunk/drivers/char/pcmcia/ipwireless/Makefile b/trunk/drivers/char/pcmcia/ipwireless/Makefile