redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  b43: fix comment typo reqest -> request
  Haavard Skinnemoen has left Atmel
  cris: typo in mach-fs Makefile
  Kconfig: fix copy/paste-ism for dell-wmi-aio driver
  doc: timers-howto: fix a typo ("unsgined")
  perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
  md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
  treewide: fix a few typos in comments
  regulator: change debug statement be consistent with the style of the rest
  Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
  audit: acquire creds selectively to reduce atomic op overhead
  rtlwifi: don't touch with treewide double semicolon removal
  treewide: cleanup continuations and remove logging message whitespace
  ath9k_hw: don't touch with treewide double semicolon removal
  include/linux/leds-regulator.h: fix syntax in example code
  tty: fix typo in descripton of tty_termios_encode_baud_rate
  xtensa: remove obsolete BKL kernel option from defconfig
  m68k: fix comment typo 'occcured'
  arch:Kconfig.locks Remove unused config option.
  treewide: remove extra semicolons
  ...
hifive-unleashed-5.1
Linus Torvalds 2011-05-23 09:12:26 -07:00
parent ee9ec4f820 e64851f5a0
commit 57d19e80f4
175 changed files with 254 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CREDITS
View File

@ -328,7 +328,7 @@ S: Haifa, Israel
N: Johannes Berg N: Johannes Berg
E: johannes@sipsolutions.net E: johannes@sipsolutions.net
W: http://johannes.sipsolutions.net/ W: http://johannes.sipsolutions.net/
P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5 P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A
D: powerpc & 802.11 hacker D: powerpc & 802.11 hacker
N: Stephen R. van den Berg (AKA BuGless) N: Stephen R. van den Berg (AKA BuGless)

2
Documentation/devicetree/bindings/powerpc/nintendo/wii.txt
View File

@ -127,7 +127,7 @@ Nintendo Wii device tree
- reg : should contain the SDHCI registers location and length - reg : should contain the SDHCI registers location and length
- interrupts : should contain the SDHCI interrupt - interrupts : should contain the SDHCI interrupt
1.j) The Inter-Processsor Communication (IPC) node 1.j) The Inter-Processor Communication (IPC) node
Represent the Inter-Processor Communication interface. This interface Represent the Inter-Processor Communication interface. This interface
enables communications between the Broadway and the Starlet processors. enables communications between the Broadway and the Starlet processors.

2
Documentation/feature-removal-schedule.txt
View File

@ -215,7 +215,7 @@ Who: Zhang Rui <rui.zhang@intel.com>
What: CONFIG_ACPI_PROCFS_POWER What: CONFIG_ACPI_PROCFS_POWER
When: 2.6.39 When: 2.6.39
Why: sysfs I/F for ACPI power devices, including AC and Battery, Why: sysfs I/F for ACPI power devices, including AC and Battery,
has been working in upstream kenrel since 2.6.24, Sep 2007. has been working in upstream kernel since 2.6.24, Sep 2007.
In 2.6.37, we make the sysfs I/F always built in and this option In 2.6.37, we make the sysfs I/F always built in and this option
disabled by default. disabled by default.
Remove this option and the ACPI power procfs interface in 2.6.39. Remove this option and the ACPI power procfs interface in 2.6.39.

2
Documentation/stable_api_nonsense.txt
View File

@ -122,7 +122,7 @@ operating system to suffer.
In both of these instances, all developers agreed that these were In both of these instances, all developers agreed that these were
important changes that needed to be made, and they were made, with important changes that needed to be made, and they were made, with
relatively little pain. If Linux had to ensure that it preserve a relatively little pain. If Linux had to ensure that it will preserve a
stable source interface, a new interface would have been created, and stable source interface, a new interface would have been created, and
the older, broken one would have had to be maintained over time, leading the older, broken one would have had to be maintained over time, leading
to extra work for the USB developers. Since all Linux USB developers do to extra work for the USB developers. Since all Linux USB developers do

4
Documentation/sysctl/vm.txt
View File

@ -481,10 +481,10 @@ the DMA zone.
Type(A) is called as "Node" order. Type (B) is "Zone" order. Type(A) is called as "Node" order. Type (B) is "Zone" order.
"Node order" orders the zonelists by node, then by zone within each node. "Node order" orders the zonelists by node, then by zone within each node.
Specify "[Nn]ode" for zone order Specify "[Nn]ode" for node order
"Zone Order" orders the zonelists by zone type, then by node within each "Zone Order" orders the zonelists by zone type, then by node within each
zone. Specify "[Zz]one"for zode order. zone. Specify "[Zz]one" for zone order.
Specify "[Dd]efault" to request automatic configuration. Autoconfiguration Specify "[Dd]efault" to request automatic configuration. Autoconfiguration
will select "node" order in following case. will select "node" order in following case.

2
Documentation/timers/timers-howto.txt
View File

@ -24,7 +24,7 @@ ATOMIC CONTEXT:
ndelay(unsigned long nsecs) ndelay(unsigned long nsecs)
udelay(unsigned long usecs) udelay(unsigned long usecs)
mdelay(unsgined long msecs) mdelay(unsigned long msecs)
udelay is the generally preferred API; ndelay-level udelay is the generally preferred API; ndelay-level
precision may not actually exist on many non-PC devices. precision may not actually exist on many non-PC devices.

3
MAINTAINERS
View File

@ -730,7 +730,7 @@ ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
M: Daniel Ribeiro <drwyrm@gmail.com> M: Daniel Ribeiro <drwyrm@gmail.com>
M: Stefan Schmidt <stefan@openezx.org> M: Stefan Schmidt <stefan@openezx.org>
M: Harald Welte <laforge@openezx.org> M: Harald Welte <laforge@openezx.org>
L: openezx-devel@lists.openezx.org (subscribers-only) L: openezx-devel@lists.openezx.org (moderated for non-subscribers)
W: http://www.openezx.org/ W: http://www.openezx.org/
S: Maintained S: Maintained
T: topgit git://git.openezx.org/openezx.git T: topgit git://git.openezx.org/openezx.git
@ -6230,6 +6230,7 @@ TRIVIAL PATCHES
M: Jiri Kosina <trivial@kernel.org> M: Jiri Kosina <trivial@kernel.org>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
S: Maintained S: Maintained
K: ^Subject:.*(?i)trivial
TTY LAYER TTY LAYER
M: Greg Kroah-Hartman <gregkh@suse.de> M: Greg Kroah-Hartman <gregkh@suse.de>

3
arch/Kconfig
View File

@ -144,9 +144,6 @@ config HAVE_CLK
config HAVE_DMA_API_DEBUG config HAVE_DMA_API_DEBUG
bool bool
config HAVE_DEFAULT_NO_SPIN_MUTEXES
bool
config HAVE_HW_BREAKPOINT config HAVE_HW_BREAKPOINT
bool bool
depends on PERF_EVENTS depends on PERF_EVENTS

2
arch/arm/mach-at91/at91cap9_devices.c
View File

@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
*/ */
usba_udc_data.pdata.vbus_pin = -EINVAL; usba_udc_data.pdata.vbus_pin = -EINVAL;
usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
if (data && data->vbus_pin > 0) { if (data && data->vbus_pin > 0) {
at91_set_gpio_input(data->vbus_pin, 0); at91_set_gpio_input(data->vbus_pin, 0);

2
arch/arm/mach-at91/at91sam9g45_devices.c
View File

@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
{ {
usba_udc_data.pdata.vbus_pin = -EINVAL; usba_udc_data.pdata.vbus_pin = -EINVAL;
usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
if (data && data->vbus_pin > 0) { if (data && data->vbus_pin > 0) {
at91_set_gpio_input(data->vbus_pin, 0); at91_set_gpio_input(data->vbus_pin, 0);

2
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
*/ */
usba_udc_data.pdata.vbus_pin = -EINVAL; usba_udc_data.pdata.vbus_pin = -EINVAL;
usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep); usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));; memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
if (data && data->vbus_pin > 0) { if (data && data->vbus_pin > 0) {
at91_set_gpio_input(data->vbus_pin, 0); at91_set_gpio_input(data->vbus_pin, 0);

2
arch/arm/mach-msm/include/mach/msm_iomap.h
View File

@ -55,7 +55,7 @@
#include "msm_iomap-8960.h" #include "msm_iomap-8960.h"
/* Virtual addressses shared across all MSM targets. */ /* Virtual addresses shared across all MSM targets. */
#define MSM_CSR_BASE IOMEM(0xE0001000) #define MSM_CSR_BASE IOMEM(0xE0001000)
#define MSM_QGIC_DIST_BASE IOMEM(0xF0000000) #define MSM_QGIC_DIST_BASE IOMEM(0xF0000000)
#define MSM_QGIC_CPU_BASE IOMEM(0xF0001000) #define MSM_QGIC_CPU_BASE IOMEM(0xF0001000)

2
arch/arm/mach-omap2/control.h
View File

@ -236,7 +236,7 @@
#define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014) #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014)
#define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018) #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018)
/* 36xx-only RTA - Retention till Accesss control registers and bits */ /* 36xx-only RTA - Retention till Access control registers and bits */
#define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C #define OMAP36XX_CONTROL_MEM_RTA_CTRL 0x40C
#define OMAP36XX_RTA_DISABLE 0x0 #define OMAP36XX_RTA_DISABLE 0x0

2
arch/arm/mach-tegra/tegra2_clocks.c
View File

@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p)
const struct clk_mux_sel *sel; const struct clk_mux_sel *sel;
int shift; int shift;
val = clk_readl(c->reg + SUPER_CLK_MUX);; val = clk_readl(c->reg + SUPER_CLK_MUX);
BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) && BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) &&
((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE)); ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE));
shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ? shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ?

6
arch/arm/mach-ux500/mbox-db5500.c
View File

@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
dev_dbg(&(mbox->pdev->dev), dev_dbg(&(mbox->pdev->dev),
"Resource name: %s start: 0x%X, end: 0x%X\n", "Resource name: %s start: 0x%X, end: 0x%X\n",
resource->name, resource->start, resource->end); resource->name, resource->start, resource->end);
mbox->virtbase_peer = mbox->virtbase_peer = ioremap(resource->start, resource_size(resource));
ioremap(resource->start, resource->end - resource->start);
if (!mbox->virtbase_peer) { if (!mbox->virtbase_peer) {
dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n"); dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n");
mbox = NULL; mbox = NULL;
@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
dev_dbg(&(mbox->pdev->dev), dev_dbg(&(mbox->pdev->dev),
"Resource name: %s start: 0x%X, end: 0x%X\n", "Resource name: %s start: 0x%X, end: 0x%X\n",
resource->name, resource->start, resource->end); resource->name, resource->start, resource->end);
mbox->virtbase_local = mbox->virtbase_local = ioremap(resource->start, resource_size(resource));
ioremap(resource->start, resource->end - resource->start);
if (!mbox->virtbase_local) { if (!mbox->virtbase_local) {
dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n"); dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n");
mbox = NULL; mbox = NULL;

1
arch/arm/plat-iop/time.c
View File

@ -17,7 +17,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/io.h> #include <linux/io.h>

4
arch/arm/plat-mxc/cpufreq.c
View File

@ -153,8 +153,8 @@ static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table); ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s: failed to register i.MXC CPUfreq \ printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",
with error code %d\n", __func__, ret); __func__, ret);
goto err; goto err;
} }

2
arch/cris/arch-v32/mach-fs/Makefile
View File

@ -4,7 +4,7 @@
# #
obj-y := dma.o pinmux.o io.o arbiter.o obj-y := dma.o pinmux.o io.o arbiter.o
bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o
clean: clean:

2
arch/ia64/hp/common/sba_iommu.c
View File

@ -1064,7 +1064,7 @@ static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
/* /*
** Address does not fall w/in IOVA, must be bypassing ** Address does not fall w/in IOVA, must be bypassing
*/ */
DBG_BYPASS("sba_unmap_single_atttrs() bypass addr: 0x%lx\n", DBG_BYPASS("sba_unmap_single_attrs() bypass addr: 0x%lx\n",
iova); iova);
#ifdef ENABLE_MARK_CLEAN #ifdef ENABLE_MARK_CLEAN

2
arch/m68k/include/asm/MC68EZ328.h
View File

@ -1047,7 +1047,7 @@ typedef volatile struct {
#define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */
#define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */
#define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */
#define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */
#define WATCHDOG_CNT_SHIFT 8 #define WATCHDOG_CNT_SHIFT 8

2
arch/m68k/include/asm/MC68VZ328.h
View File

@ -1143,7 +1143,7 @@ typedef struct {
#define WATCHDOG_EN 0x0001 /* Watchdog Enabled */ #define WATCHDOG_EN 0x0001 /* Watchdog Enabled */
#define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */ #define WATCHDOG_ISEL 0x0002 /* Select the watchdog interrupt */
#define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occcured */ #define WATCHDOG_INTF 0x0080 /* Watchdog interrupt occurred */
#define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */ #define WATCHDOG_CNT_MASK 0x0300 /* Watchdog Counter */
#define WATCHDOG_CNT_SHIFT 8 #define WATCHDOG_CNT_SHIFT 8

2
arch/mips/fw/arc/cmdline.c
View File

@ -5,7 +5,7 @@
* *
* cmdline.c: Kernel command line creation using ARCS argc/argv. * cmdline.c: Kernel command line creation using ARCS argc/argv.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/fw/arc/env.c
View File

@ -5,7 +5,7 @@
* *
* env.c: ARCS environment variable routines. * env.c: ARCS environment variable routines.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/fw/arc/identify.c
View File

@ -9,7 +9,7 @@
* *
* This code is based on arch/mips/sgi/kernel/system.c, which is * This code is based on arch/mips/sgi/kernel/system.c, which is
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/fw/arc/init.c
View File

@ -5,7 +5,7 @@
* *
* PROM library initialisation code. * PROM library initialisation code.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/fw/arc/misc.c
View File

@ -5,7 +5,7 @@
* *
* Miscellaneous ARCS PROM routines. * Miscellaneous ARCS PROM routines.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
*/ */

2
arch/mips/fw/arc/salone.c
View File

@ -2,7 +2,7 @@
* Routines to load into memory and execute stand-along program images using * Routines to load into memory and execute stand-along program images using
* ARCS PROM firmware. * ARCS PROM firmware.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/sgialib.h> #include <asm/sgialib.h>

2
arch/mips/fw/arc/time.c
View File

@ -5,7 +5,7 @@
* *
* Extracting time information from ARCS prom. * Extracting time information from ARCS prom.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <linux/init.h> #include <linux/init.h>

2
arch/mips/fw/arc/tree.c
View File

@ -5,7 +5,7 @@
* *
* PROM component device tree code. * PROM component device tree code.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
*/ */

2
arch/mips/include/asm/asmmacro-32.h
View File

@ -1,7 +1,7 @@
/* /*
* asmmacro.h: Assembler macros to make things easier to read. * asmmacro.h: Assembler macros to make things easier to read.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1998, 1999, 2003 Ralf Baechle * Copyright (C) 1998, 1999, 2003 Ralf Baechle
*/ */
#ifndef _ASM_ASMMACRO_32_H #ifndef _ASM_ASMMACRO_32_H

2
arch/mips/include/asm/asmmacro-64.h
View File

@ -1,7 +1,7 @@
/* /*
* asmmacro.h: Assembler macros to make things easier to read. * asmmacro.h: Assembler macros to make things easier to read.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1998, 1999 Ralf Baechle * Copyright (C) 1998, 1999 Ralf Baechle
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
*/ */

2
arch/mips/include/asm/cpu.h
View File

@ -2,7 +2,7 @@
* cpu.h: Values of the PRId register used to match up * cpu.h: Values of the PRId register used to match up
* various MIPS cpu types. * various MIPS cpu types.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 2004 Maciej W. Rozycki * Copyright (C) 2004 Maciej W. Rozycki
*/ */
#ifndef _ASM_CPU_H #ifndef _ASM_CPU_H

2
arch/mips/include/asm/r4kcache.h
View File

@ -5,7 +5,7 @@
* *
* Inline assembly cache operations. * Inline assembly cache operations.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997 - 2002 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1997 - 2002 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org) * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org)
*/ */

2
arch/mips/include/asm/sgialib.h
View File

@ -5,7 +5,7 @@
* *
* SGI ARCS firmware interface library for the Linux kernel. * SGI ARCS firmware interface library for the Linux kernel.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 2001, 2002 Ralf Baechle (ralf@gnu.org) * Copyright (C) 2001, 2002 Ralf Baechle (ralf@gnu.org)
*/ */
#ifndef _ASM_SGIALIB_H #ifndef _ASM_SGIALIB_H

2
arch/mips/include/asm/sgiarcs.h
View File

@ -5,7 +5,7 @@
* *
* ARC firmware interface defines. * ARC firmware interface defines.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1999, 2001 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1999, 2001 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
*/ */

2
arch/mips/kernel/octeon_switch.S
View File

@ -4,7 +4,7 @@
* for more details. * for more details.
* *
* Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1994, 1995, 1996, by Andreas Busse * Copyright (C) 1994, 1995, 1996, by Andreas Busse
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
* Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 2000 MIPS Technologies, Inc.

2
arch/mips/kernel/r2300_fpu.S
View File

@ -6,7 +6,7 @@
* Copyright (C) 1996, 1998 by Ralf Baechle * Copyright (C) 1996, 1998 by Ralf Baechle
* *
* Multi-arch abstraction and asm macros for easier reading: * Multi-arch abstraction and asm macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* Further modifications to make this work: * Further modifications to make this work:
* Copyright (c) 1998 Harald Koerfgen * Copyright (c) 1998 Harald Koerfgen

2
arch/mips/kernel/r2300_switch.S
View File

@ -5,7 +5,7 @@
* Copyright (C) 1994, 1995, 1996 by Andreas Busse * Copyright (C) 1994, 1995, 1996 by Andreas Busse
* *
* Multi-cpu abstraction and macros for easier reading: * Multi-cpu abstraction and macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* Further modifications to make this work: * Further modifications to make this work:
* Copyright (c) 1998-2000 Harald Koerfgen * Copyright (c) 1998-2000 Harald Koerfgen

2
arch/mips/kernel/r4k_fpu.S
View File

@ -6,7 +6,7 @@
* Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle * Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle
* *
* Multi-arch abstraction and asm macros for easier reading: * Multi-arch abstraction and asm macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 2000 MIPS Technologies, Inc.

2
arch/mips/kernel/r4k_switch.S
View File

@ -4,7 +4,7 @@
* for more details. * for more details.
* *
* Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1994, 1995, 1996, by Andreas Busse * Copyright (C) 1994, 1995, 1996, by Andreas Busse
* Copyright (C) 1999 Silicon Graphics, Inc. * Copyright (C) 1999 Silicon Graphics, Inc.
* Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 2000 MIPS Technologies, Inc.

2
arch/mips/kernel/r6000_fpu.S
View File

@ -8,7 +8,7 @@
* Copyright (C) 1996 by Ralf Baechle * Copyright (C) 1996 by Ralf Baechle
* *
* Multi-arch abstraction and asm macros for easier reading: * Multi-arch abstraction and asm macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/fpregdef.h> #include <asm/fpregdef.h>

2
arch/mips/mm/c-r3k.c
View File

@ -1,7 +1,7 @@
/* /*
* r2300.c: R2000 and R3000 specific mmu/cache code. * r2300.c: R2000 and R3000 specific mmu/cache code.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* with a lot of changes to make this thing work for R3000s * with a lot of changes to make this thing work for R3000s
* Tx39XX R4k style caches added. HK * Tx39XX R4k style caches added. HK

2
arch/mips/mm/c-r4k.c
View File

@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999, 2000 Silicon Graphics, Inc. * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/ */

2
arch/mips/mm/c-tx39.c
View File

@ -1,7 +1,7 @@
/* /*
* r2300.c: R2000 and R3000 specific mmu/cache code. * r2300.c: R2000 and R3000 specific mmu/cache code.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* with a lot of changes to make this thing work for R3000s * with a lot of changes to make this thing work for R3000s
* Tx39XX R4k style caches added. HK * Tx39XX R4k style caches added. HK

2
arch/mips/mm/sc-ip22.c
View File

@ -2,7 +2,7 @@
* sc-ip22.c: Indy cache management functions. * sc-ip22.c: Indy cache management functions.
* *
* Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org),
* derived from r4xx0.c by David S. Miller (dm@engr.sgi.com). * derived from r4xx0.c by David S. Miller (davem@davemloft.net).
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/mm/sc-r5k.c
View File

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org), * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org),
* derived from r4xx0.c by David S. Miller (dm@engr.sgi.com). * derived from r4xx0.c by David S. Miller (davem@davemloft.net).
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
arch/mips/mm/tlb-r3k.c
View File

@ -1,7 +1,7 @@
/* /*
* r2300.c: R2000 and R3000 specific mmu/cache code. * r2300.c: R2000 and R3000 specific mmu/cache code.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* *
* with a lot of changes to make this thing work for R3000s * with a lot of changes to make this thing work for R3000s
* Tx39XX R4k style caches added. HK * Tx39XX R4k style caches added. HK

2
arch/mips/mm/tlb-r4k.c
View File

@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.

2
arch/mips/mm/tlb-r8k.c
View File

@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved.

2
arch/mips/sgi-ip22/ip22-hpc.c
View File

@ -1,7 +1,7 @@
/* /*
* ip22-hpc.c: Routines for generic manipulation of the HPC controllers. * ip22-hpc.c: Routines for generic manipulation of the HPC controllers.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1998 Ralf Baechle * Copyright (C) 1998 Ralf Baechle
*/ */

2
arch/mips/sgi-ip22/ip22-int.c
View File

@ -2,7 +2,7 @@
* ip22-int.c: Routines for generic manipulation of the INT[23] ASIC * ip22-int.c: Routines for generic manipulation of the INT[23] ASIC
* found on INDY and Indigo2 workstations. * found on INDY and Indigo2 workstations.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)
* Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu)
* - Indigo2 changes * - Indigo2 changes

2
arch/mips/sgi-ip22/ip22-mc.c
View File

@ -1,7 +1,7 @@
/* /*
* ip22-mc.c: Routines for manipulating SGI Memory Controller. * ip22-mc.c: Routines for manipulating SGI Memory Controller.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes
* Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org) * Copyright (C) 2003 Ladislav Michl (ladis@linux-mips.org)
* Copyright (C) 2004 Peter Fuerst (pf@net.alphadv.de) - IP28 * Copyright (C) 2004 Peter Fuerst (pf@net.alphadv.de) - IP28

2
arch/mips/sgi-ip22/ip22-setup.c
View File

@ -1,7 +1,7 @@
/* /*
* ip22-setup.c: SGI specific setup, including init of the feature struct. * ip22-setup.c: SGI specific setup, including init of the feature struct.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
* Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org) * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)
*/ */
#include <linux/init.h> #include <linux/init.h>

2
arch/powerpc/include/asm/pte-hash64-64k.h
View File

@ -22,7 +22,7 @@
#define _PAGE_HASHPTE _PAGE_HPTE_SUB #define _PAGE_HASHPTE _PAGE_HPTE_SUB
/* Note the full page bits must be in the same location as for normal /* Note the full page bits must be in the same location as for normal
* 4k pages as the same asssembly will be used to insert 64K pages * 4k pages as the same assembly will be used to insert 64K pages
* wether the kernel has CONFIG_PPC_64K_PAGES or not * wether the kernel has CONFIG_PPC_64K_PAGES or not
*/ */
#define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */

2
arch/powerpc/kernel/kgdb.c
View File

@ -142,7 +142,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
return 0; return 0;
/* /*
* On Book E and perhaps other processsors, singlestep is handled on * On Book E and perhaps other processors, singlestep is handled on
* the critical exception stack. This causes current_thread_info() * the critical exception stack. This causes current_thread_info()
* to fail, since it it locates the thread_info by masking off * to fail, since it it locates the thread_info by masking off
* the low bits of the current stack pointer. We work around * the low bits of the current stack pointer. We work around

2
arch/s390/hypfs/hypfs.h
View File

@ -47,7 +47,7 @@ struct hypfs_dbfs_data {
void *buf; void *buf;
void *buf_free_ptr; void *buf_free_ptr;
size_t size; size_t size;
struct hypfs_dbfs_file *dbfs_file;; struct hypfs_dbfs_file *dbfs_file;
struct kref kref; struct kref kref;
}; };

2
arch/um/drivers/mmapper_kern.c
View File

@ -116,7 +116,7 @@ static int __init mmapper_init(void)
if (err) { if (err) {
printk(KERN_ERR "mmapper - misc_register failed, err = %d\n", printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
err); err);
return err;; return err;
} }
return 0; return 0;
} }

2
arch/x86/xen/pci-swiotlb-xen.c
View File

@ -36,7 +36,7 @@ int __init pci_xen_swiotlb_detect(void)
/* If running as PV guest, either iommu=soft, or swiotlb=force will /* If running as PV guest, either iommu=soft, or swiotlb=force will
* activate this IOMMU. If running as PV privileged, activate it * activate this IOMMU. If running as PV privileged, activate it
* irregardlesss. * irregardless.
*/ */
if ((xen_initial_domain() || swiotlb || swiotlb_force) && if ((xen_initial_domain() || swiotlb || swiotlb_force) &&
(xen_pv_domain())) (xen_pv_domain()))

1
arch/xtensa/configs/s6105_defconfig
View File

@ -23,7 +23,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
# #
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCALVERSION_AUTO=y

2
drivers/acpi/acpica/utresrc.c
View File

@ -50,7 +50,7 @@ ACPI_MODULE_NAME("utresrc")
#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
/* /*
* Strings used to decode resource descriptors. * Strings used to decode resource descriptors.
* Used by both the disasssembler and the debugger resource dump routines * Used by both the disassembler and the debugger resource dump routines
*/ */
const char *acpi_gbl_bm_decode[] = { const char *acpi_gbl_bm_decode[] = {
"NotBusMaster", "NotBusMaster",

2
drivers/acpi/video.c
View File

@ -1521,7 +1521,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
acpi_bus_generate_proc_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);
keycode = KEY_BRIGHTNESSDOWN; keycode = KEY_BRIGHTNESSDOWN;
break; break;
case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */ case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightness */
if (brightness_switch_enabled) if (brightness_switch_enabled)
acpi_video_switch_brightness(video_device, event); acpi_video_switch_brightness(video_device, event);
acpi_bus_generate_proc_event(device, event, 0); acpi_bus_generate_proc_event(device, event, 0);

9
drivers/base/memory.c
View File

@ -389,15 +389,14 @@ memory_probe_store(struct class *class, struct class_attribute *attr,
ret = add_memory(nid, phys_addr, ret = add_memory(nid, phys_addr,
PAGES_PER_SECTION << PAGE_SHIFT); PAGES_PER_SECTION << PAGE_SHIFT);
if (ret) if (ret)
break; goto out;
phys_addr += MIN_MEMORY_BLOCK_SIZE; phys_addr += MIN_MEMORY_BLOCK_SIZE;
} }
if (ret) ret = count;
count = ret; out:
return ret;
return count;
} }
static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);

6
drivers/dma/dmatest.c
View File

@ -56,8 +56,8 @@ MODULE_PARM_DESC(pq_sources,
static int timeout = 3000; static int timeout = 3000;
module_param(timeout, uint, S_IRUGO); module_param(timeout, uint, S_IRUGO);
MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), \ MODULE_PARM_DESC(timeout, "Transfer Timeout in msec (default: 3000), "
Pass -1 for infinite timeout"); "Pass -1 for infinite timeout");
/* /*
* Initialization patterns. All bytes in the source buffer has bit 7 * Initialization patterns. All bytes in the source buffer has bit 7
@ -634,5 +634,5 @@ static void __exit dmatest_exit(void)
} }
module_exit(dmatest_exit); module_exit(dmatest_exit);
MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

2
drivers/dma/dw_dmac.c
View File

@ -1486,4 +1486,4 @@ module_exit(dw_exit);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");

2
drivers/firmware/efivars.c
View File

@ -321,7 +321,7 @@ efivar_show_raw(struct efivar_entry *entry, char *buf)
/* /*
* Generic read/write functions that call the specific functions of * Generic read/write functions that call the specific functions of
* the atttributes... * the attributes...
*/ */
static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr, static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr,
char *buf) char *buf)

4
drivers/firmware/iscsi_ibft.c
View File

@ -87,8 +87,8 @@
#define IBFT_ISCSI_VERSION "0.5.0" #define IBFT_ISCSI_VERSION "0.5.0"
#define IBFT_ISCSI_DATE "2010-Feb-25" #define IBFT_ISCSI_DATE "2010-Feb-25"
MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and \ MODULE_AUTHOR("Peter Jones <pjones@redhat.com> and "
Konrad Rzeszutek <ketuzsezr@darnok.org>"); "Konrad Rzeszutek <ketuzsezr@darnok.org>");
MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information"); MODULE_DESCRIPTION("sysfs interface to BIOS iBFT information");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(IBFT_ISCSI_VERSION); MODULE_VERSION(IBFT_ISCSI_VERSION);

7
drivers/gpio/ab8500-gpio.c
View File

@ -482,8 +482,8 @@ static int __devexit ab8500_gpio_remove(struct platform_device *pdev)
ret = gpiochip_remove(&ab8500_gpio->chip); ret = gpiochip_remove(&ab8500_gpio->chip);
if (ret < 0) { if (ret < 0) {
dev_err(ab8500_gpio->dev, "unable to remove gpiochip:\ dev_err(ab8500_gpio->dev, "unable to remove gpiochip: %d\n",
%d\n", ret); ret);
return ret; return ret;
} }
@ -516,7 +516,6 @@ static void __exit ab8500_gpio_exit(void)
module_exit(ab8500_gpio_exit); module_exit(ab8500_gpio_exit);
MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>"); MODULE_AUTHOR("BIBEK BASU <bibek.basu@stericsson.com>");
MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins\ MODULE_DESCRIPTION("Driver allows to use AB8500 unused pins to be used as GPIO");
to be used as GPIO");
MODULE_ALIAS("AB8500 GPIO driver"); MODULE_ALIAS("AB8500 GPIO driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

2
drivers/gpio/langwell_gpio.c
View File

@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip,
lnw_gpio_set(chip, offset, value); lnw_gpio_set(chip, offset, value);
spin_lock_irqsave(&lnw->lock, flags); spin_lock_irqsave(&lnw->lock, flags);
value = readl(gpdr); value = readl(gpdr);
value |= BIT(offset % 32);; value |= BIT(offset % 32);
writel(value, gpdr); writel(value, gpdr);
spin_unlock_irqrestore(&lnw->lock, flags); spin_unlock_irqrestore(&lnw->lock, flags);
return 0; return 0;

2
drivers/gpu/drm/radeon/radeon_fence.c
View File

@ -322,7 +322,7 @@ void radeon_fence_unref(struct radeon_fence **fence)
*fence = NULL; *fence = NULL;
if (tmp) { if (tmp) {
kref_put(&tmp->kref, &radeon_fence_destroy); kref_put(&tmp->kref, radeon_fence_destroy);
} }
} }

2
drivers/gpu/drm/radeon/radeon_ring.c
View File

@ -194,7 +194,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr); r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr);
radeon_bo_unreserve(rdev->ib_pool.robj); radeon_bo_unreserve(rdev->ib_pool.robj);
if (r) { if (r) {
DRM_ERROR("radeon: failed to map ib poll (%d).\n", r); DRM_ERROR("radeon: failed to map ib pool (%d).\n", r);
return r; return r;
} }
for (i = 0; i < RADEON_IB_POOL_SIZE; i++) { for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {

2
drivers/gpu/drm/ttm/ttm_object.c
View File

@ -206,7 +206,7 @@ void ttm_base_object_unref(struct ttm_base_object **p_base)
*/ */
write_lock(&tdev->object_lock); write_lock(&tdev->object_lock);
(void)kref_put(&base->refcount, &ttm_release_base); kref_put(&base->refcount, ttm_release_base);
write_unlock(&tdev->object_lock); write_unlock(&tdev->object_lock);
} }
EXPORT_SYMBOL(ttm_base_object_unref); EXPORT_SYMBOL(ttm_base_object_unref);

2
drivers/i2c/busses/i2c-gpio.c
View File

@ -219,7 +219,7 @@ static void __exit i2c_gpio_exit(void)
} }
module_exit(i2c_gpio_exit); module_exit(i2c_gpio_exit);
MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver"); MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:i2c-gpio"); MODULE_ALIAS("platform:i2c-gpio");

2
drivers/leds/leds-mc13783.c
View File

@ -235,7 +235,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
MC13783_LED_Cx_PERIOD; MC13783_LED_Cx_PERIOD;
if (pdata->flags & MC13783_LED_TRIODE_TC3) if (pdata->flags & MC13783_LED_TRIODE_TC3)
reg |= MC13783_LED_Cx_TRIODE_TC_BIT;; reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg); ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
if (ret) if (ret)

4
drivers/macintosh/therm_pm72.c
View File

@ -44,11 +44,11 @@
* TODO: - Check MPU structure version/signature * TODO: - Check MPU structure version/signature
* - Add things like /sbin/overtemp for non-critical * - Add things like /sbin/overtemp for non-critical
* overtemp conditions so userland can take some policy * overtemp conditions so userland can take some policy
* decisions, like slewing down CPUs * decisions, like slowing down CPUs
* - Deal with fan and i2c failures in a better way * - Deal with fan and i2c failures in a better way
* - Maybe do a generic PID based on params used for * - Maybe do a generic PID based on params used for
* U3 and Drives ? Definitely need to factor code a bit * U3 and Drives ? Definitely need to factor code a bit
* bettter... also make sensor detection more robust using * better... also make sensor detection more robust using
* the device-tree to probe for them * the device-tree to probe for them
* - Figure out how to get the slots consumption and set the * - Figure out how to get the slots consumption and set the
* slots fan accordingly * slots fan accordingly

2
drivers/md/raid5.c
View File

@ -3958,7 +3958,7 @@ static int make_request(mddev_t *mddev, struct bio * bi)
/* spinlock is needed as reshape_progress may be /* spinlock is needed as reshape_progress may be
* 64bit on a 32bit platform, and so it might be * 64bit on a 32bit platform, and so it might be
* possible to see a half-updated value * possible to see a half-updated value
* Ofcourse reshape_progress could change after * Of course reshape_progress could change after
* the lock is dropped, so once we get a reference * the lock is dropped, so once we get a reference
* to the stripe that we think it is, we will have * to the stripe that we think it is, we will have
* to check again. * to check again.

2
drivers/media/dvb/dvb-usb/dw2102.c
View File

@ -1377,7 +1377,7 @@ static struct rc_map_table rc_map_su3000_table[] = {
{ 0x0f, KEY_BLUE }, /* bottom yellow button */ { 0x0f, KEY_BLUE }, /* bottom yellow button */
{ 0x14, KEY_AUDIO }, /* Snapshot */ { 0x14, KEY_AUDIO }, /* Snapshot */
{ 0x38, KEY_TV }, /* TV/Radio */ { 0x38, KEY_TV }, /* TV/Radio */
{ 0x0c, KEY_ESC } /* upper Red buttton */ { 0x0c, KEY_ESC } /* upper Red button */
}; };
static struct rc_map_dvb_usb_table_table keys_tables[] = { static struct rc_map_dvb_usb_table_table keys_tables[] = {

2
drivers/media/video/msp3400-driver.c
View File

@ -96,7 +96,7 @@ MODULE_PARM_DESC(debug, "Enable debug messages [0-3]");
MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo"); MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo");
MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect"); MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect");
MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan"); MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
MODULE_PARM_DESC(dolby, "Activates Dolby processsing"); MODULE_PARM_DESC(dolby, "Activates Dolby processing");
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

2
drivers/media/video/saa7164/saa7164-encoder.c
View File

@ -177,7 +177,7 @@ static int saa7164_encoder_buffers_alloc(struct saa7164_port *port)
} }
} }
/* Allocate some kenrel kernel buffers for copying /* Allocate some kernel buffers for copying
* to userpsace. * to userpsace.
*/ */
len = params->numberoflines * params->pitch; len = params->numberoflines * params->pitch;

2
drivers/media/video/saa7164/saa7164-vbi.c
View File

@ -148,7 +148,7 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port)
} }
} }
/* Allocate some kenrel kernel buffers for copying /* Allocate some kernel buffers for copying
* to userpsace. * to userpsace.
*/ */
len = params->numberoflines * params->pitch; len = params->numberoflines * params->pitch;

5
drivers/media/video/usbvision/usbvision-video.c
View File

@ -70,8 +70,9 @@
#include "usbvision.h" #include "usbvision.h"
#include "usbvision-cards.h" #include "usbvision-cards.h"
#define DRIVER_AUTHOR "Joerg Heckenbach <joerg@heckenbach-aw.de>, \ #define DRIVER_AUTHOR \
Dwaine Garden <DwaineGarden@rogers.com>" "Joerg Heckenbach <joerg@heckenbach-aw.de>, " \
"Dwaine Garden <DwaineGarden@rogers.com>"
#define DRIVER_NAME "usbvision" #define DRIVER_NAME "usbvision"
#define DRIVER_ALIAS "USBVision" #define DRIVER_ALIAS "USBVision"
#define DRIVER_DESC "USBVision USB Video Device Driver for Linux" #define DRIVER_DESC "USBVision USB Video Device Driver for Linux"

22
drivers/message/fusion/mptbase.c
View File

@ -83,19 +83,18 @@ MODULE_VERSION(my_VERSION);
static int mpt_msi_enable_spi; static int mpt_msi_enable_spi;
module_param(mpt_msi_enable_spi, int, 0); module_param(mpt_msi_enable_spi, int, 0);
MODULE_PARM_DESC(mpt_msi_enable_spi, " Enable MSI Support for SPI \ MODULE_PARM_DESC(mpt_msi_enable_spi,
controllers (default=0)"); " Enable MSI Support for SPI controllers (default=0)");
static int mpt_msi_enable_fc; static int mpt_msi_enable_fc;
module_param(mpt_msi_enable_fc, int, 0); module_param(mpt_msi_enable_fc, int, 0);
MODULE_PARM_DESC(mpt_msi_enable_fc, " Enable MSI Support for FC \ MODULE_PARM_DESC(mpt_msi_enable_fc,
controllers (default=0)"); " Enable MSI Support for FC controllers (default=0)");
static int mpt_msi_enable_sas; static int mpt_msi_enable_sas;
module_param(mpt_msi_enable_sas, int, 0); module_param(mpt_msi_enable_sas, int, 0);
MODULE_PARM_DESC(mpt_msi_enable_sas, " Enable MSI Support for SAS \ MODULE_PARM_DESC(mpt_msi_enable_sas,
controllers (default=0)"); " Enable MSI Support for SAS controllers (default=0)");
static int mpt_channel_mapping; static int mpt_channel_mapping;
module_param(mpt_channel_mapping, int, 0); module_param(mpt_channel_mapping, int, 0);
@ -105,15 +104,14 @@ static int mpt_debug_level;
static int mpt_set_debug_level(const char *val, struct kernel_param *kp); static int mpt_set_debug_level(const char *val, struct kernel_param *kp);
module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int, module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int,
&mpt_debug_level, 0600); &mpt_debug_level, 0600);
MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h \ MODULE_PARM_DESC(mpt_debug_level,
- (default=0)"); " debug level - refer to mptdebug.h - (default=0)");
int mpt_fwfault_debug; int mpt_fwfault_debug;
EXPORT_SYMBOL(mpt_fwfault_debug); EXPORT_SYMBOL(mpt_fwfault_debug);
module_param(mpt_fwfault_debug, int, 0600); module_param(mpt_fwfault_debug, int, 0600);
MODULE_PARM_DESC(mpt_fwfault_debug, "Enable detection of Firmware fault" MODULE_PARM_DESC(mpt_fwfault_debug,
" and halt Firmware on fault - (default=0)"); "Enable detection of Firmware fault and halt Firmware on fault - (default=0)");
static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50];

2
drivers/message/i2o/README.ioctl
View File

@ -110,7 +110,7 @@ V. Getting Logical Configuration Table
ENOBUFS Buffer not large enough. If this occurs, the required ENOBUFS Buffer not large enough. If this occurs, the required
buffer length is written into *(lct->reslen) buffer length is written into *(lct->reslen)
VI. Settting Parameters VI. Setting Parameters
SYNOPSIS SYNOPSIS

8
drivers/misc/bh1780gli.c
View File

@ -49,8 +49,8 @@ static int bh1780_write(struct bh1780_data *ddata, u8 reg, u8 val, char *msg)
int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); int ret = i2c_smbus_write_byte_data(ddata->client, reg, val);
if (ret < 0) if (ret < 0)
dev_err(&ddata->client->dev, dev_err(&ddata->client->dev,
"i2c_smbus_write_byte_data failed error %d\ "i2c_smbus_write_byte_data failed error %d Register (%s)\n",
Register (%s)\n", ret, msg); ret, msg);
return ret; return ret;
} }
@ -59,8 +59,8 @@ static int bh1780_read(struct bh1780_data *ddata, u8 reg, char *msg)
int ret = i2c_smbus_read_byte_data(ddata->client, reg); int ret = i2c_smbus_read_byte_data(ddata->client, reg);
if (ret < 0) if (ret < 0)
dev_err(&ddata->client->dev, dev_err(&ddata->client->dev,
"i2c_smbus_read_byte_data failed error %d\ "i2c_smbus_read_byte_data failed error %d Register (%s)\n",
Register (%s)\n", ret, msg); ret, msg);
return ret; return ret;
} }

4
drivers/misc/cs5535-mfgpt.c
View File

@ -329,7 +329,7 @@ done:
return err; return err;
} }
static struct platform_driver cs5535_mfgpt_drv = { static struct platform_driver cs5535_mfgpt_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -340,7 +340,7 @@ static struct platform_driver cs5535_mfgpt_drv = {
static int __init cs5535_mfgpt_init(void) static int __init cs5535_mfgpt_init(void)
{ {
return platform_driver_register(&cs5535_mfgpt_drv); return platform_driver_register(&cs5535_mfgpt_driver);
} }
module_init(cs5535_mfgpt_init); module_init(cs5535_mfgpt_init);

2
drivers/misc/ibmasm/ibmasmfs.c
View File

@ -29,7 +29,7 @@
/* /*
* The IBMASM file virtual filesystem. It creates the following hierarchy * The IBMASM file virtual filesystem. It creates the following hierarchy
* dymamically when mounted from user space: * dynamically when mounted from user space:
* *
* /ibmasm * /ibmasm
* |-- 0 * |-- 0

4
drivers/misc/spear13xx_pcie_gadget.c
View File

@ -787,8 +787,8 @@ static int __devinit spear_pcie_gadget_probe(struct platform_device *pdev)
status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL); status = request_irq(irq, spear_pcie_gadget_irq, 0, pdev->name, NULL);
if (status) { if (status) {
dev_err(&pdev->dev, "pcie gadget interrupt IRQ%d already \ dev_err(&pdev->dev,
claimed\n", irq); "pcie gadget interrupt IRQ%d already claimed\n", irq);
goto err_iounmap; goto err_iounmap;
} }

2
drivers/mmc/host/atmel-mci.c
View File

@ -1899,5 +1899,5 @@ late_initcall(atmci_init); /* try to load after dma driver when built-in */
module_exit(atmci_exit); module_exit(atmci_exit);
MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver"); MODULE_DESCRIPTION("Atmel Multimedia Card Interface driver");
MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

5
drivers/net/atlx/atl1.c
View File

@ -83,8 +83,9 @@
#include "atl1.h" #include "atl1.h"
#define ATLX_DRIVER_VERSION "2.1.3" #define ATLX_DRIVER_VERSION "2.1.3"
MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, \ MODULE_AUTHOR("Xiong Huang <xiong.huang@atheros.com>, "
Chris Snook <csnook@redhat.com>, Jay Cliburn <jcliburn@gmail.com>"); "Chris Snook <csnook@redhat.com>, "
"Jay Cliburn <jcliburn@gmail.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(ATLX_DRIVER_VERSION); MODULE_VERSION(ATLX_DRIVER_VERSION);

2
drivers/net/can/pch_can.c
View File

@ -653,7 +653,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
u16 data_reg; u16 data_reg;
do { do {
/* Reading the messsage object from the Message RAM */ /* Reading the message object from the Message RAM */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask); iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num); pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num);

2
drivers/net/can/softing/softing_main.c
View File

@ -797,7 +797,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
ret = -EINVAL; ret = -EINVAL;
pres = platform_get_resource(pdev, IORESOURCE_MEM, 0); pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!pres) if (!pres)
goto platform_resource_failed;; goto platform_resource_failed;
card->dpram_phys = pres->start; card->dpram_phys = pres->start;
card->dpram_size = pres->end - pres->start + 1; card->dpram_size = pres->end - pres->start + 1;
card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size); card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);

2
drivers/net/irda/ali-ircc.c
View File

@ -1800,7 +1800,7 @@ static int ali_ircc_dma_receive_complete(struct ali_ircc_cb *self)
MessageCount = inb(iobase+ FIR_LSR)&0x07; MessageCount = inb(iobase+ FIR_LSR)&0x07;
if (MessageCount > 0) if (MessageCount > 0)
IRDA_DEBUG(0, "%s(), Messsage count = %d,\n", __func__ , MessageCount); IRDA_DEBUG(0, "%s(), Message count = %d,\n", __func__ , MessageCount);
for (i=0; i<=MessageCount; i++) for (i=0; i<=MessageCount; i++)
{ {

2
drivers/net/macb.c
View File

@ -1356,5 +1356,5 @@ module_exit(macb_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Atmel MACB Ethernet driver"); MODULE_DESCRIPTION("Atmel MACB Ethernet driver");
MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
MODULE_ALIAS("platform:macb"); MODULE_ALIAS("platform:macb");

2
drivers/net/s2io.c
View File

@ -7163,7 +7163,7 @@ static void do_s2io_card_down(struct s2io_nic *sp, int do_io)
/* As per the HW requirement we need to replenish the /* As per the HW requirement we need to replenish the
* receive buffer to avoid the ring bump. Since there is * receive buffer to avoid the ring bump. Since there is
* no intention of processing the Rx frame at this pointwe are * no intention of processing the Rx frame at this pointwe are
* just settting the ownership bit of rxd in Each Rx * just setting the ownership bit of rxd in Each Rx
* ring to HW and set the appropriate buffer size * ring to HW and set the appropriate buffer size
* based on the ring mode * based on the ring mode
*/ */

2
drivers/net/sgiseeq.c
View File

@ -1,7 +1,7 @@
/* /*
* sgiseeq.c: Seeq8003 ethernet driver for SGI machines. * sgiseeq.c: Seeq8003 ethernet driver for SGI machines.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#undef DEBUG #undef DEBUG

2
drivers/net/sgiseeq.h
View File

@ -1,7 +1,7 @@
/* /*
* sgiseeq.h: Defines for the Seeq8003 ethernet controller. * sgiseeq.h: Defines for the Seeq8003 ethernet controller.
* *
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
*/ */
#ifndef _SGISEEQ_H #ifndef _SGISEEQ_H
#define _SGISEEQ_H #define _SGISEEQ_H

2
drivers/net/ucc_geth_ethtool.c
View File

@ -6,7 +6,7 @@
* Author: Li Yang <leoli@freescale.com> * Author: Li Yang <leoli@freescale.com>
* *
* Limitation: * Limitation:
* Can only get/set setttings of the first queue. * Can only get/set settings of the first queue.
* Need to re-open the interface manually after changing some parameters. * Need to re-open the interface manually after changing some parameters.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it

2
drivers/net/usb/usbnet.c
View File

@ -109,7 +109,7 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
/* take the first altsetting with in-bulk + out-bulk; /* take the first altsetting with in-bulk + out-bulk;
* remember any status endpoint, just in case; * remember any status endpoint, just in case;
* ignore other endpoints and altsetttings. * ignore other endpoints and altsettings.
*/ */
for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) { for (ep = 0; ep < alt->desc.bNumEndpoints; ep++) {
struct usb_host_endpoint *e; struct usb_host_endpoint *e;

2
drivers/net/wan/pc300_drv.c
View File

@ -1445,7 +1445,7 @@ static void falc_update_stats(pc300_t * card, int ch)
* Description: In the remote loopback mode the clock and data recovered * Description: In the remote loopback mode the clock and data recovered
* from the line inputs RL1/2 or RDIP/RDIN are routed back * from the line inputs RL1/2 or RDIP/RDIN are routed back
* to the line outputs XL1/2 or XDOP/XDON via the analog * to the line outputs XL1/2 or XDOP/XDON via the analog
* transmitter. As in normal mode they are processsed by * transmitter. As in normal mode they are processed by
* the synchronizer and then sent to the system interface. * the synchronizer and then sent to the system interface.
*---------------------------------------------------------------------------- *----------------------------------------------------------------------------
*/ */

27
drivers/net/wireless/airo.c
View File

@ -242,9 +242,8 @@ static int airo_perm = 0555;
static int proc_perm = 0644; static int proc_perm = 0644;
MODULE_AUTHOR("Benjamin Reed"); MODULE_AUTHOR("Benjamin Reed");
MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet \ MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. "
cards. Direct support for ISA/PCI/MPI cards and support \ "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.");
for PCMCIA when used with airo_cs.");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");
module_param_array(io, int, NULL, 0); module_param_array(io, int, NULL, 0);
@ -252,18 +251,20 @@ module_param_array(irq, int, NULL, 0);
module_param_array(rates, int, NULL, 0); module_param_array(rates, int, NULL, 0);
module_param_array(ssids, charp, NULL, 0); module_param_array(ssids, charp, NULL, 0);
module_param(auto_wep, int, 0); module_param(auto_wep, int, 0);
MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \ MODULE_PARM_DESC(auto_wep,
the authentication options until an association is made. The value of \ "If non-zero, the driver will keep looping through the authentication options until an association is made. "
auto_wep is number of the wep keys to check. A value of 2 will try using \ "The value of auto_wep is number of the wep keys to check. "
the key at index 0 and index 1."); "A value of 2 will try using the key at index 0 and index 1.");
module_param(aux_bap, int, 0); module_param(aux_bap, int, 0);
MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \ MODULE_PARM_DESC(aux_bap,
than seems to work better for older cards with some older buses. Before \ "If non-zero, the driver will switch into a mode that seems to work better for older cards with some older buses. "
switching it checks that the switch is needed."); "Before switching it checks that the switch is needed.");
module_param(maxencrypt, int, 0); module_param(maxencrypt, int, 0);
MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \ MODULE_PARM_DESC(maxencrypt,
encryption. Units are in 512kbs. Zero (default) means there is no limit. \ "The maximum speed that the card can do encryption. "
Older cards used to be limited to 2mbs (4)."); "Units are in 512kbs. "
"Zero (default) means there is no limit. "
"Older cards used to be limited to 2mbs (4).");
module_param(adhoc, int, 0); module_param(adhoc, int, 0);
MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode.");
module_param(probe, int, 0); module_param(probe, int, 0);

8
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
View File

@ -3327,26 +3327,26 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
else else
cptr = AR9300_BASE_ADDR; cptr = AR9300_BASE_ADDR;
ath_dbg(common, ATH_DBG_EEPROM, ath_dbg(common, ATH_DBG_EEPROM,
"Trying EEPROM accesss at Address 0x%04x\n", cptr); "Trying EEPROM access at Address 0x%04x\n", cptr);
if (ar9300_check_eeprom_header(ah, read, cptr)) if (ar9300_check_eeprom_header(ah, read, cptr))
goto found; goto found;
cptr = AR9300_BASE_ADDR_512; cptr = AR9300_BASE_ADDR_512;
ath_dbg(common, ATH_DBG_EEPROM, ath_dbg(common, ATH_DBG_EEPROM,
"Trying EEPROM accesss at Address 0x%04x\n", cptr); "Trying EEPROM access at Address 0x%04x\n", cptr);
if (ar9300_check_eeprom_header(ah, read, cptr)) if (ar9300_check_eeprom_header(ah, read, cptr))
goto found; goto found;
read = ar9300_read_otp; read = ar9300_read_otp;
cptr = AR9300_BASE_ADDR; cptr = AR9300_BASE_ADDR;
ath_dbg(common, ATH_DBG_EEPROM, ath_dbg(common, ATH_DBG_EEPROM,
"Trying OTP accesss at Address 0x%04x\n", cptr); "Trying OTP access at Address 0x%04x\n", cptr);
if (ar9300_check_eeprom_header(ah, read, cptr)) if (ar9300_check_eeprom_header(ah, read, cptr))
goto found; goto found;
cptr = AR9300_BASE_ADDR_512; cptr = AR9300_BASE_ADDR_512;
ath_dbg(common, ATH_DBG_EEPROM, ath_dbg(common, ATH_DBG_EEPROM,
"Trying OTP accesss at Address 0x%04x\n", cptr); "Trying OTP access at Address 0x%04x\n", cptr);
if (ar9300_check_eeprom_header(ah, read, cptr)) if (ar9300_check_eeprom_header(ah, read, cptr))
goto found; goto found;

Some files were not shown because too many files have changed in this diff Show More