From 06d62f8288fdc984cd16f2e904882deaead58a2f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 9 Jun 2014 18:20:23 +0300 Subject: gma500: remove duplicate FB_REG09 define The FB_REG09 define is cut and pasted twice so we can remove the second instance. Signed-off-by: Dan Carpenter Signed-off-by: Jiri Kosina diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index a97e38e..d75ecb3 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c @@ -39,7 +39,6 @@ static void mid_get_fuse_settings(struct drm_device *dev) #define FB_REG06 0xD0810600 #define FB_MIPI_DISABLE (1 << 11) #define FB_REG09 0xD0810900 -#define FB_REG09 0xD0810900 #define FB_SKU_MASK 0x7000 #define FB_SKU_SHIFT 12 #define FB_SKU_100 0 -- cgit v0.10.2 From 917aef61f4c27063b873eaffce2fdc03d6e3d416 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:21 -0400 Subject: doc: RCU: update reference, kerneltrap.org no longer works kerneltrap.org no longer works, update to a working reference Signed-off-by: Pranith Kumar Signed-off-by: Jiri Kosina diff --git a/Documentation/RCU/RTFP.txt b/Documentation/RCU/RTFP.txt index 2f0fcb2..f29bcbc 100644 --- a/Documentation/RCU/RTFP.txt +++ b/Documentation/RCU/RTFP.txt @@ -2451,8 +2451,8 @@ lot of {Linux} into your technology!!!" ,month="February" ,year="2010" ,note="Available: -\url{http://kerneltrap.com/mailarchive/linux-netdev/2010/2/26/6270589} -[Viewed March 20, 2011]" +\url{http://thread.gmane.org/gmane.linux.network/153338} +[Viewed June 9, 2014]" ,annotation={ Use a pair of list_head structures to support RCU-protected resizable hash tables. -- cgit v0.10.2 From d0a5ccc99ebcc100bf3e4316286a9f07ac180494 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:22 -0400 Subject: doc: SubmittingPatches: remove dead link, kerneltrap.org no longer works kerneltrap.org no longer works, remove the dead reference Signed-off-by: Pranith Kumar Signed-off-by: Jiri Kosina diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers index 36d16bb..31d3726 100644 --- a/Documentation/SubmittingDrivers +++ b/Documentation/SubmittingDrivers @@ -146,10 +146,6 @@ LWN.net: Porting drivers from prior kernels to 2.6: http://lwn.net/Articles/driver-porting/ -KernelTrap: - Occasional Linux kernel articles and developer interviews - http://kerneltrap.org/ - KernelNewbies: Documentation and assistance for new kernel programmers http://kernelnewbies.org/ -- cgit v0.10.2 From 591bcb18eec308a5f6ed0f089e437a0c32d642b4 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:23 -0400 Subject: doc: LSM: update reference, kerneltrap.org no longer works kerneltrap.org no longer works, update to a working reference Signed-off-by: Pranith Kumar Signed-off-by: Jiri Kosina diff --git a/Documentation/security/LSM.txt b/Documentation/security/LSM.txt index c335a76..3db7e67 100644 --- a/Documentation/security/LSM.txt +++ b/Documentation/security/LSM.txt @@ -22,7 +22,7 @@ system, building their checks on top of the defined capability hooks. For more details on capabilities, see capabilities(7) in the Linux man-pages project. -Based on http://kerneltrap.org/Linux/Documenting_Security_Module_Intent, +Based on https://lkml.org/lkml/2007/10/26/215, a new LSM is accepted into the kernel when its intent (a description of what it tries to protect against and in what cases one would expect to use it) has been appropriately documented in Documentation/security/. -- cgit v0.10.2 From 847db926a5312d23126b6b37e25b08ac9b0cddc1 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:24 -0400 Subject: hexagon: update reference, kerneltrap.org no longer works kerneltrap.org no longer works, update to a working reference Signed-off-by: Pranith Kumar Acked-by: Richard Kuo Signed-off-by: Jiri Kosina diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h index f4ca594..2635117 100644 --- a/arch/hexagon/include/asm/cache.h +++ b/arch/hexagon/include/asm/cache.h @@ -28,7 +28,7 @@ #define __cacheline_aligned __aligned(L1_CACHE_BYTES) #define ____cacheline_aligned __aligned(L1_CACHE_BYTES) -/* See http://kerneltrap.org/node/15100 */ +/* See http://lwn.net/Articles/262554/ */ #define __read_mostly #endif -- cgit v0.10.2 From 3c50e599e7c7f80e59d31331f82adc13495768f8 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:25 -0400 Subject: media: update reference, kerneltrap.org no longer works kerneltrap.org no longer works, update to a working reference Signed-off-by: Pranith Kumar Acked-by: Alexey Klimov Signed-off-by: Jiri Kosina diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index a360227..f476071 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c @@ -32,7 +32,7 @@ * achievements (specifications given). * Also, Faidon Liambotis wrote nice driver for this radio * in 2007. He allowed to use his driver to improve current mr800 radio driver. - * http://kerneltrap.org/mailarchive/linux-usb-devel/2007/10/11/342492 + * http://www.spinics.net/lists/linux-usb-devel/msg10109.html * * Version 0.01: First working version. * It's required to blacklist AverMedia USB Radio -- cgit v0.10.2 From 7981e729448d8c7538c294e3022257b142259c37 Mon Sep 17 00:00:00 2001 From: Pranith Kumar Date: Mon, 9 Jun 2014 11:55:26 -0400 Subject: doc: CN: remove dead link, kerneltrap.org no longer works kerneltrap.org no longer works, remove dead reference Signed-off-by: Pranith Kumar Signed-off-by: Jiri Kosina diff --git a/Documentation/zh_CN/SubmittingDrivers b/Documentation/zh_CN/SubmittingDrivers index 5889f8d..d313f5d 100644 --- a/Documentation/zh_CN/SubmittingDrivers +++ b/Documentation/zh_CN/SubmittingDrivers @@ -150,10 +150,6 @@ LWN.net: 将旧版内核的驱动程序移植到 2.6 版： http://lwn.net/Articles/driver-porting/ -KernelTrap： - Linux 内核的最新动态以及开发者访谈 - http://kerneltrap.org/ - 内核新手(KernelNewbies): 为新的内核开发者提供文档和帮助 http://kernelnewbies.org/ -- cgit v0.10.2 From 381de9c0e3e60ed2acf8c681a69bbeb94a02cdba Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Wed, 18 Jun 2014 16:18:36 +0200 Subject: crypto: Remove MPILIB_EXTRA The symbol is an orphan, get rid of it. Signed-off-by: Richard Weinberger Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig index 03a6eb9..0320c7d 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig @@ -22,7 +22,6 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE config PUBLIC_KEY_ALGO_RSA tristate "RSA public-key algorithm" - select MPILIB_EXTRA select MPILIB help This option enables support for the RSA algorithm (PKCS#1, RFC3447). -- cgit v0.10.2 From 8a7a1558e50cac1004dba19a9bc414c4e9efccba Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 18 Jun 2014 16:04:44 +0200 Subject: ARM: msm: Remove MSM_SCM Commit 8fc1b0f87d9f ("ARM: qcom: Split Qualcomm support into legacy and multiplatform") removed all users of Kconfig symbol MSM_SCM. Remove that symbol too. Signed-off-by: Paul Bolle Reviewed-by: Stephen Boyd Signed-off-by: Jiri Kosina diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 9625cf3..f69fc2e 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -150,9 +150,6 @@ config MSM_GPIOMUX help Support for MSM V1 TLMM GPIOMUX architecture. -config MSM_SCM - bool - config MSM_TIMER bool -- cgit v0.10.2 From e70cfe4aec0880d45c0ba773123fe18b9d699a64 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Wed, 11 Jun 2014 12:03:49 +0200 Subject: SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index eb1cf84..892c6ce 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -371,7 +371,7 @@ if SH_MAGIC_PANEL_R2 menu "Magic Panel R2 options" config SH_MAGIC_PANEL_R2_VERSION - int SH_MAGIC_PANEL_R2_VERSION + int "Magic Panel R2 Version" default "3" help Set the version of the Magic Panel R2 -- cgit v0.10.2 From 8740e687a658dae04f64f99c07891dc4b5f0251f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 6 Jun 2014 14:30:59 +0200 Subject: kbuild: fix comment in Makefile.modinst Signed-off-by: Olaf Hering Signed-off-by: Jiri Kosina diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index ecbb447..95ec7b3 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -31,6 +31,6 @@ $(modules): # Declare the contents of the .PHONY variable as phony. We keep that -# information in a variable se we can use it in if_changed and friends. +# information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY) -- cgit v0.10.2 From 429a91db3b3e7f755b1e9fa3bcd95660d84697ad Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Fri, 6 Jun 2014 12:29:17 -0700 Subject: usb: doc: hotplug.txt code typos Fixed several typos in the code examples given in Documentation/usb/hotplug.txt. - missing [] with array of struct usb_device_id - checkpatch.pl warning: space between function name and parenthesis - missing terminating ';' Signed-off-by: Jeremiah Mahler Signed-off-by: Jiri Kosina diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt index 6424b13..a80b0e9 100644 --- a/Documentation/usb/hotplug.txt +++ b/Documentation/usb/hotplug.txt @@ -105,13 +105,13 @@ macros such as these, and use driver_info to store more information. A short example, for a driver that supports several specific USB devices and their quirks, might have a MODULE_DEVICE_TABLE like this: - static const struct usb_device_id mydriver_id_table = { + static const struct usb_device_id mydriver_id_table[] = { { USB_DEVICE (0x9999, 0xaaaa), driver_info: QUIRK_X }, { USB_DEVICE (0xbbbb, 0x8888), driver_info: QUIRK_Y|QUIRK_Z }, ... { } /* end with an all-zeroes entry */ - } - MODULE_DEVICE_TABLE (usb, mydriver_id_table); + }; + MODULE_DEVICE_TABLE(usb, mydriver_id_table); Most USB device drivers should pass these tables to the USB subsystem as well as to the module management subsystem. Not all, though: some driver @@ -134,7 +134,7 @@ something like this: if exposing any operations through usbdevfs: .ioctl = my_ioctl, */ - } + }; When the USB subsystem knows about a driver's device ID table, it's used when choosing drivers to probe(). The thread doing new device processing checks -- cgit v0.10.2 From d5ae11dc402f64a3b79ef6754487429b772f3e71 Mon Sep 17 00:00:00 2001 From: Rickard Strandqvist Date: Wed, 4 Jun 2014 23:28:10 +0200 Subject: doc: hpfall.c: fix missing null-terminate after strncpy call Added a guaranteed null-terminate after call to strncpy. This was partly found using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist Signed-off-by: Jiri Kosina diff --git a/Documentation/laptops/hpfall.c b/Documentation/laptops/hpfall.c index b85dbba..6708432 100644 --- a/Documentation/laptops/hpfall.c +++ b/Documentation/laptops/hpfall.c @@ -28,6 +28,7 @@ int set_unload_heads_path(char *device) if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0) return -EINVAL; strncpy(devname, device + 5, sizeof(devname)); + devname[sizeof(devname) - 1] = '\0'; snprintf(unload_heads_path, sizeof(unload_heads_path) - 1, "/sys/block/%s/device/unload_heads", devname); -- cgit v0.10.2 From 2fba5376ed7d8cdebd873ee124b8e5dd3c936f92 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 4 Jun 2014 14:03:45 +0200 Subject: cpuidle: fix comment Signed-off-by: Antonio Ospite Cc: "Rafael J. Wysocki" Cc: "tuukka.tikkanen@linaro.org" Signed-off-by: Jiri Kosina diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 71b5232..daf8502 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -406,7 +406,7 @@ static void menu_update(struct cpuidle_driver *drv, struct cpuidle_device *dev) * * Any measured amount of time will include the exit latency. * Since we are interested in when the wakeup begun, not when it - * was completed, we must substract the exit latency. However, if + * was completed, we must subtract the exit latency. However, if * the measured amount of time is less than the exit latency, * assume the state was never reached and the exit latency is 0. */ -- cgit v0.10.2 From b39fc89034b465bdfab13d62b37f1fe49c7577bf Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 4 Jun 2014 14:03:46 +0200 Subject: mfd: fix comment Signed-off-by: Antonio Ospite Cc: Mika Westerberg Cc: Samuel Ortiz Signed-off-by: Jiri Kosina diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c index 049fd23..443e7cd 100644 --- a/drivers/mfd/intel_msic.c +++ b/drivers/mfd/intel_msic.c @@ -27,7 +27,7 @@ /* * MSIC interrupt tree is readable from SRAM at INTEL_MSIC_IRQ_PHYS_BASE. - * Since IRQ block starts from address 0x002 we need to substract that from + * Since IRQ block starts from address 0x002 we need to subtract that from * the actual IRQ status register address. */ #define MSIC_IRQ_STATUS(x) (INTEL_MSIC_IRQ_PHYS_BASE + ((x) - 2)) -- cgit v0.10.2 From fb1928de2b47857853c6161353f5df100b44fe0b Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 4 Jun 2014 14:03:42 +0200 Subject: drivers/usb/phy/phy.c: remove a leading space Signed-off-by: Antonio Ospite Acked-by: Felipe Balbi Signed-off-by: Jiri Kosina diff --git a/drivers/usb/phy/phy.c b/drivers/usb/phy/phy.c index 8afa813..9c6baab 100644 --- a/drivers/usb/phy/phy.c +++ b/drivers/usb/phy/phy.c @@ -144,7 +144,7 @@ err0: } EXPORT_SYMBOL_GPL(usb_get_phy); - /** +/** * devm_usb_get_phy_by_phandle - find the USB PHY by phandle * @dev - device that requests this phy * @phandle - name of the property holding the phy phandle value -- cgit v0.10.2 From ae9fbcac197d7ad1f0c3a4004bac36eb7414f607 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 30 May 2014 09:01:05 +0200 Subject: scsi: doc: fix 'SCSI_NCR_SETUP_MASTER_PARITY' Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index cda5f8f..1d508dc 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt @@ -1095,7 +1095,7 @@ SCSI_NCR_SETUP_FORCE_SYNC_NEGO (default: not defined) SCSI_NCR_SETUP_MASTER_PARITY (default: defined) If defined, master parity checking is enabled. -SCSI_NCR_SETUP_MASTER_PARITY (default: defined) +SCSI_NCR_SETUP_SCSI_PARITY (default: defined) If defined, SCSI parity checking is enabled. SCSI_NCR_PROFILE_SUPPORT (default: not defined) -- cgit v0.10.2 From fe786f61f32367e31d11a1b236aff29992d19a57 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 27 May 2014 10:22:27 +0200 Subject: befs: remove check for CONFIG_BEFS_RW Befs contains a check for CONFIG_BEFS_RW for over a decade now. The related Kconfig symbol never existed, so this check always evaluated to true. Remove it. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 845d2d6..2d2bcf5 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -808,13 +808,11 @@ befs_fill_super(struct super_block *sb, void *data, int silent) befs_debug(sb, "---> befs_fill_super()"); -#ifndef CONFIG_BEFS_RW if (!(sb->s_flags & MS_RDONLY)) { befs_warning(sb, "No write support. Marking filesystem read-only"); sb->s_flags |= MS_RDONLY; } -#endif /* CONFIG_BEFS_RW */ /* * Set dummy blocksize to read super block. -- cgit v0.10.2 From 305af08c5398bab6c7029da53eb15d85a53eef0e Mon Sep 17 00:00:00 2001 From: Jeremiah Mahler Date: Thu, 22 May 2014 00:04:26 -0700 Subject: doc: replace "practise" with "practice" in Documentation To keep the Documentation consistent either "practise" or "practice" should be used. Since there are 3 lines with "practise" ~/linux/Documentation$ grep -r practise * | wc -l 3 and 108 lines with "practice" ~/linux/Documentation$ grep -r practice * | wc -l 108 this patch converts "practise" to "practice". Signed-off-by: Jeremiah Mahler Signed-off-by: Jiri Kosina diff --git a/Documentation/PCI/MSI-HOWTO.txt b/Documentation/PCI/MSI-HOWTO.txt index 10a9369..0d920d5 100644 --- a/Documentation/PCI/MSI-HOWTO.txt +++ b/Documentation/PCI/MSI-HOWTO.txt @@ -576,7 +576,7 @@ Some devices are known to have faulty MSI implementations. Usually this is handled in the individual device driver, but occasionally it's necessary to handle this with a quirk. Some drivers have an option to disable use of MSI. While this is a convenient workaround for the driver author, -it is not good practise, and should not be emulated. +it is not good practice, and should not be emulated. 5.4. Finding why MSIs are disabled on a device diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 26b1e31d..04c1edd 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -369,13 +369,13 @@ you are responsible for last-minute changes. Example : [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] Signed-off-by: Lucky K Maintainer -This practise is particularly helpful if you maintain a stable branch and +This practice is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author's identity (the From header), as it is the one which appears in the changelog. -Special note to back-porters: It seems to be a common and useful practise +Special note to back-porters: It seems to be a common and useful practice to insert an indication of the origin of a patch at the top of the commit message (just after the subject line) to facilitate tracking. For instance, here's what we see in 2.6-stable : -- cgit v0.10.2 From eaa015d2bfc85dcabb44184b6ef826361b993c4b Mon Sep 17 00:00:00 2001 From: Rickard Strandqvist Date: Sun, 18 May 2014 18:12:26 +0200 Subject: scsi: mvsas: mv_sas.c: Fix for possible null pointer dereference There is otherwise a risk of a possible null pointer dereference. Was largely found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist Reviewed-by: Christoph Hellwig Signed-off-by: Jiri Kosina diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 6c1f223..ac52f7c 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -1344,19 +1344,23 @@ void mvs_dev_gone_notify(struct domain_device *dev) { unsigned long flags = 0; struct mvs_device *mvi_dev = dev->lldd_dev; - struct mvs_info *mvi = mvi_dev->mvi_info; - - spin_lock_irqsave(&mvi->lock, flags); + struct mvs_info *mvi; - if (mvi_dev) { - mv_dprintk("found dev[%d:%x] is gone.\n", - mvi_dev->device_id, mvi_dev->dev_type); - mvs_release_task(mvi, dev); - mvs_free_reg_set(mvi, mvi_dev); - mvs_free_dev(mvi_dev); - } else { + if (!mvi_dev) { mv_dprintk("found dev has gone.\n"); + return; } + + mvi = mvi_dev->mvi_info; + + spin_lock_irqsave(&mvi->lock, flags); + + mv_dprintk("found dev[%d:%x] is gone.\n", + mvi_dev->device_id, mvi_dev->dev_type); + mvs_release_task(mvi, dev); + mvs_free_reg_set(mvi, mvi_dev); + mvs_free_dev(mvi_dev); + dev->lldd_dev = NULL; mvi_dev->sas_device = NULL; -- cgit v0.10.2 From ee7a77a7c170a8d6a7706a52d8f3482b5944e319 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Fri, 16 May 2014 04:41:09 -0400 Subject: MAINTAINERS: Add miscdevice.h to file list for char/misc drivers. Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina diff --git a/MAINTAINERS b/MAINTAINERS index ee175ff..70b3de6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2146,6 +2146,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git S: Supported F: drivers/char/* F: drivers/misc/* +F: include/linux/miscdevice.h CHECKPATCH M: Andy Whitcroft -- cgit v0.10.2 From d31e373d077848f5d40abd8621b4ebd4d2179dd7 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Wed, 5 Mar 2014 22:43:45 +0300 Subject: irq-gic: remove file name from heading comment File names in the heading comments fell out of favor long ago, and this one weren't even changed when the driver was moved from arch/arm/common/, so remove it at last... Signed-off-by: Sergei Shtylyov Signed-off-by: Jiri Kosina diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 531769b..3b7650f 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1,6 +1,4 @@ /* - * linux/arch/arm/common/gic.c - * * Copyright (C) 2002 ARM Limited, All Rights Reserved. * * This program is free software; you can redistribute it and/or modify -- cgit v0.10.2 From 51a7097426f2243e192df4979c2bf197e6f2ce61 Mon Sep 17 00:00:00 2001 From: Sangjung Woo Date: Wed, 30 Jul 2014 09:56:21 +0900 Subject: doc: fix two typos in watchdog-api.txt This patch changes 'go of' to 'go off' and 'pretimout' to 'pretimeout'. Signed-off-by: Sangjung Woo Reviewed-by: Guenter Roeck Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index eb7132e..b3a701f 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt @@ -118,7 +118,7 @@ resets. Note that the pretimeout is the number of seconds before the time when the timeout will go off. It is not the number of seconds until the pretimeout. So, for instance, if you set the timeout to 60 seconds -and the pretimeout to 10 seconds, the pretimout will go of in 50 +and the pretimeout to 10 seconds, the pretimeout will go off in 50 seconds. Setting a pretimeout to zero disables it. There is also a get function for getting the pretimeout: -- cgit v0.10.2