leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
This commit is contained in:
Linus Torvalds 2012-01-08 13:21:22 -08:00
commit 98793265b4
176 changed files with 266 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
View File

@ -1,7 +1,7 @@
What: /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range. What: /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
Date: July 2011 Date: July 2011
KernelVersion: 3.2 KernelVersion: 3.2
Contact: Michal Malý <madcatxster@gmail.com> Contact: Michal Malý <madcatxster@gmail.com>
Description: Display minimum, maximum and current range of the steering Description: Display minimum, maximum and current range of the steering
wheel. Writing a value within min and max boundaries sets the wheel. Writing a value within min and max boundaries sets the
range of the wheel. range of the wheel.

4
Documentation/cpu-freq/governors.txt
View File

@ -127,7 +127,7 @@ in the bash (as said, 1000 is default), do:
echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \ echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \
>ondemand/sampling_rate >ondemand/sampling_rate
show_sampling_rate_min: sampling_rate_min:
The sampling rate is limited by the HW transition latency: The sampling rate is limited by the HW transition latency:
transition_latency * 100 transition_latency * 100
Or by kernel restrictions: Or by kernel restrictions:
@ -140,8 +140,6 @@ HZ=100: min=200000us (200ms)
The highest value of kernel and HW latency restrictions is shown and The highest value of kernel and HW latency restrictions is shown and
used as the minimum sampling rate. used as the minimum sampling rate.
show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
up_threshold: defines what the average CPU usage between the samplings up_threshold: defines what the average CPU usage between the samplings
of 'sampling_rate' needs to be for the kernel to make a decision on of 'sampling_rate' needs to be for the kernel to make a decision on
whether it should increase the frequency. For example when it is set whether it should increase the frequency. For example when it is set

2
Documentation/devices.txt
View File

@ -379,7 +379,7 @@ Your cooperation is appreciated.
162 = /dev/smbus System Management Bus 162 = /dev/smbus System Management Bus
163 = /dev/lik Logitech Internet Keyboard 163 = /dev/lik Logitech Internet Keyboard
164 = /dev/ipmo Intel Intelligent Platform Management 164 = /dev/ipmo Intel Intelligent Platform Management
165 = /dev/vmmon VMWare virtual machine monitor 165 = /dev/vmmon VMware virtual machine monitor
166 = /dev/i2o/ctl I2O configuration manager 166 = /dev/i2o/ctl I2O configuration manager
167 = /dev/specialix_sxctl Specialix serial control 167 = /dev/specialix_sxctl Specialix serial control
168 = /dev/tcldrv Technology Concepts serial control 168 = /dev/tcldrv Technology Concepts serial control

21
Documentation/scsi/53c700.txt
View File

@ -16,32 +16,13 @@ fill in to get the driver working.
Compile Time Flags Compile Time Flags
================== ==================
The driver may be either io mapped or memory mapped. This is A compile time flag is:
selectable by configuration flags:
CONFIG_53C700_MEM_MAPPED
define if the driver is memory mapped.
CONFIG_53C700_IO_MAPPED
define if the driver is to be io mapped.
One or other of the above flags *must* be defined.
Other flags are:
CONFIG_53C700_LE_ON_BE CONFIG_53C700_LE_ON_BE
define if the chipset must be supported in little endian mode on a big define if the chipset must be supported in little endian mode on a big
endian architecture (used for the 700 on parisc). endian architecture (used for the 700 on parisc).
CONFIG_53C700_USE_CONSISTENT
allocate consistent memory (should only be used if your architecture
has a mixture of consistent and inconsistent memory). Fully
consistent or fully inconsistent architectures should not define this.
Using the Chip Core Driver Using the Chip Core Driver
========================== ==========================

2
Documentation/vgaarbiter.txt
View File

@ -177,7 +177,7 @@ II. Credits
Benjamin Herrenschmidt (IBM?) started this work when he discussed such design Benjamin Herrenschmidt (IBM?) started this work when he discussed such design
with the Xorg community in 2005 [1, 2]. In the end of 2007, Paulo Zanoni and with the Xorg community in 2005 [1, 2]. In the end of 2007, Paulo Zanoni and
Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work
enhancing the kernel code to adapt as a kernel module and also did the enhancing the kernel code to adapt as a kernel module and also did the
implementation of the user space side [3]. Now (2009) Tiago Vignatti and Dave implementation of the user space side [3]. Now (2009) Tiago Vignatti and Dave
Airlie finally put this work in shape and queued to Jesse Barnes' PCI tree. Airlie finally put this work in shape and queued to Jesse Barnes' PCI tree.

19
MAINTAINERS
View File

@ -3182,6 +3182,16 @@ M: William Irwin <wli@holomorphy.com>
S: Maintained S: Maintained
F: fs/hugetlbfs/ F: fs/hugetlbfs/
Hyper-V CORE AND DRIVERS
M: K. Y. Srinivasan <kys@microsoft.com>
M: Haiyang Zhang <haiyangz@microsoft.com>
L: devel@linuxdriverproject.org
S: Maintained
F: drivers/hv/
F: drivers/hid/hid-hyperv.c
F: drivers/net/hyperv/
F: drivers/staging/hv/
I2C/SMBUS STUB DRIVER I2C/SMBUS STUB DRIVER
M: "Mark M. Hoffman" <mhoffman@lightlink.com> M: "Mark M. Hoffman" <mhoffman@lightlink.com>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
@ -3577,8 +3587,7 @@ F: net/netfilter/ipvs/
IPWIRELESS DRIVER IPWIRELESS DRIVER
M: Jiri Kosina <jkosina@suse.cz> M: Jiri Kosina <jkosina@suse.cz>
M: David Sterba <dsterba@suse.cz> M: David Sterba <dsterba@suse.cz>
S: Maintained S: Odd Fixes
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
F: drivers/tty/ipwireless/ F: drivers/tty/ipwireless/
IPX NETWORK LAYER IPX NETWORK LAYER
@ -6321,12 +6330,6 @@ M: David Täht <d@teklibre.com>
S: Odd Fixes S: Odd Fixes
F: drivers/staging/frontier/ F: drivers/staging/frontier/
STAGING - HYPER-V (MICROSOFT)
M: Hank Janssen <hjanssen@microsoft.com>
M: Haiyang Zhang <haiyangz@microsoft.com>
S: Odd Fixes
F: drivers/staging/hv/
STAGING - INDUSTRIAL IO STAGING - INDUSTRIAL IO
M: Jonathan Cameron <jic23@cam.ac.uk> M: Jonathan Cameron <jic23@cam.ac.uk>
L: linux-iio@vger.kernel.org L: linux-iio@vger.kernel.org

3
arch/arm/Kconfig
View File

@ -1140,10 +1140,9 @@ config IWMMXT
Enable support for iWMMXt context switching at run time if Enable support for iWMMXt context switching at run time if
running on a CPU that supports it. running on a CPU that supports it.
# bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
config XSCALE_PMU config XSCALE_PMU
bool bool
depends on CPU_XSCALE && !XSCALE_PMU_TIMER depends on CPU_XSCALE
default y default y
config CPU_HAS_PMU config CPU_HAS_PMU

2
arch/arm/mach-pxa/colibri-pxa270-income.c
View File

@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {}
/****************************************************************************** /******************************************************************************
* Backlight * Backlight
******************************************************************************/ ******************************************************************************/
#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE) #if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
static struct platform_pwm_backlight_data income_backlight_data = { static struct platform_pwm_backlight_data income_backlight_data = {
.pwm_id = 0, .pwm_id = 0,
.max_brightness = 0x3ff, .max_brightness = 0x3ff,

2
arch/arm/plat-omap/include/plat/serial.h
View File

@ -2,7 +2,7 @@
* arch/arm/plat-omap/include/mach/serial.h * arch/arm/plat-omap/include/mach/serial.h
* *
* Copyright (C) 2009 Texas Instruments * Copyright (C) 2009 Texas Instruments
* Addded OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com> * Added OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com>
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of

1
arch/cris/Kconfig.debug
View File

@ -1,6 +1,5 @@
menu "Kernel hacking" menu "Kernel hacking"
#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
config PROFILING config PROFILING
bool "Kernel profiling support" bool "Kernel profiling support"

10
arch/frv/Kconfig
View File

@ -341,16 +341,6 @@ source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
#config MATH_EMULATION
# bool "Math emulation support (EXPERIMENTAL)"
# depends on EXPERIMENTAL
# help
# At some point in the future, this will cause floating-point math
# instructions to be emulated by the kernel on machines that lack a
# floating-point math coprocessor. Thrill-seekers and chronically
# sleep-deprived psychotic hacker types can say Y now, everyone else
# should probably wait a while.
menu "Power management options" menu "Power management options"
config ARCH_SUSPEND_POSSIBLE config ARCH_SUSPEND_POSSIBLE

5
arch/mips/Kconfig
View File

@ -68,7 +68,6 @@ config AR7
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_ZBOOT_UART16550 select SYS_SUPPORTS_ZBOOT_UART16550
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select GCD
select VLYNQ select VLYNQ
help help
Support for the Texas Instruments AR7 System-on-a-Chip Support for the Texas Instruments AR7 System-on-a-Chip
@ -2369,10 +2368,6 @@ config TC
Linux driver support status is documented at: Linux driver support status is documented at:
<http://www.linux-mips.org/wiki/DECstation> <http://www.linux-mips.org/wiki/DECstation>
#config ACCESSBUS
# bool "Access.Bus support"
# depends on TC
config MMU config MMU
bool bool
default y default y

6
arch/mips/sgi-ip27/Kconfig
View File

@ -1,9 +1,3 @@
#config SGI_SN0_XXL
# bool "IP27 XXL"
# depends on SGI_IP27
# This options adds support for userspace processes up to 16TB size.
# Normally the limit is just .5TB.
choice choice
prompt "Node addressing mode" prompt "Node addressing mode"
depends on SGI_IP27 depends on SGI_IP27

1
arch/mips/sibyte/Kconfig
View File

@ -71,7 +71,6 @@ config SIBYTE_SB1xxx_SOC
bool bool
select DMA_COHERENT select DMA_COHERENT
select IRQ_CPU select IRQ_CPU
select SIBYTE_CFE
select SWAP_IO_SPACE select SWAP_IO_SPACE
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL

2
arch/powerpc/include/asm/io.h
View File

@ -394,7 +394,7 @@ __do_out_asm(_rec_outl, "stwbrx")
#endif /* CONFIG_PPC32 */ #endif /* CONFIG_PPC32 */
/* The "__do_*" operations below provide the actual "base" implementation /* The "__do_*" operations below provide the actual "base" implementation
* for each of the defined acccessor. Some of them use the out_* functions * for each of the defined accessors. Some of them use the out_* functions
* directly, some of them still use EEH, though we might change that in the * directly, some of them still use EEH, though we might change that in the
* future. Those macros below provide the necessary argument swapping and * future. Those macros below provide the necessary argument swapping and
* handling of the IO base for PIO. * handling of the IO base for PIO.

2
arch/powerpc/include/asm/keylargo.h
View File

@ -51,7 +51,7 @@
#define KL_GPIO_SOUND_POWER (KEYLARGO_GPIO_0+0x05) #define KL_GPIO_SOUND_POWER (KEYLARGO_GPIO_0+0x05)
/* Hrm... this one is only to be used on Pismo. It seeem to also /* Hrm... this one is only to be used on Pismo. It seems to also
* control the timebase enable on other machines. Still to be * control the timebase enable on other machines. Still to be
* experimented... --BenH. * experimented... --BenH.
*/ */

2
arch/powerpc/mm/numa.c
View File

@ -501,7 +501,7 @@ static int of_get_assoc_arrays(struct device_node *memory,
aa->n_arrays = *prop++; aa->n_arrays = *prop++;
aa->array_sz = *prop++; aa->array_sz = *prop++;
/* Now that we know the number of arrrays and size of each array, /* Now that we know the number of arrays and size of each array,
* revalidate the size of the property read in. * revalidate the size of the property read in.
*/ */
if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int)) if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int))

40
arch/powerpc/platforms/40x/Kconfig
View File

@ -1,19 +1,3 @@
#config BUBINGA
# bool "Bubinga"
# depends on 40x
# default n
# select 405EP
# help
# This option enables support for the IBM 405EP evaluation board.
#config CPCI405
# bool "CPCI405"
# depends on 40x
# default n
# select 405GP
# help
# This option enables support for the CPCI405 board.
config ACADIA config ACADIA
bool "Acadia" bool "Acadia"
depends on 40x depends on 40x
@ -65,14 +49,6 @@ config MAKALU
help help
This option enables support for the AMCC PPC405EX board. This option enables support for the AMCC PPC405EX board.
#config SYCAMORE
# bool "Sycamore"
# depends on 40x
# default n
# select 405GPR
# help
# This option enables support for the IBM PPC405GPr evaluation board.
config WALNUT config WALNUT
bool "Walnut" bool "Walnut"
depends on 40x depends on 40x
@ -183,21 +159,6 @@ config IBM405_ERR77
config IBM405_ERR51 config IBM405_ERR51
bool bool
#config BIOS_FIXUP
# bool
# depends on BUBINGA || EP405 || SYCAMORE || WALNUT
# default y
#config PPC4xx_DMA
# bool "PPC4xx DMA controller support"
# depends on 4xx
#config PPC4xx_EDMA
# bool
# depends on !STB03xxx && PPC4xx_DMA
# default y
#
config APM8018X config APM8018X
bool "APM8018X" bool "APM8018X"
depends on 40x depends on 40x
@ -206,4 +167,3 @@ config APM8018X
help help
This option enables support for the AppliedMicro APM8018X evaluation This option enables support for the AppliedMicro APM8018X evaluation
board. board.

18
arch/powerpc/platforms/44x/Kconfig
View File

@ -75,7 +75,7 @@ config KATMAI
select PCI select PCI
select PPC4xx_PCI_EXPRESS select PPC4xx_PCI_EXPRESS
select PCI_MSI select PCI_MSI
select PCC4xx_MSI select PPC4xx_MSI
help help
This option enables support for the AMCC PPC440SPe evaluation board. This option enables support for the AMCC PPC440SPe evaluation board.
@ -207,22 +207,6 @@ config ICON
help help
This option enables support for the AMCC PPC440SPe evaluation board. This option enables support for the AMCC PPC440SPe evaluation board.
#config LUAN
# bool "Luan"
# depends on 44x
# default n
# select 440SP
# help
# This option enables support for the IBM PPC440SP evaluation board.
#config OCOTEA
# bool "Ocotea"
# depends on 44x
# default n
# select 440GX
# help
# This option enables support for the IBM PPC440GX evaluation board.
config XILINX_VIRTEX440_GENERIC_BOARD config XILINX_VIRTEX440_GENERIC_BOARD
bool "Generic Xilinx Virtex 5 FXT board support" bool "Generic Xilinx Virtex 5 FXT board support"
depends on 44x depends on 44x

1
arch/powerpc/platforms/512x/Kconfig
View File

@ -12,7 +12,6 @@ config MPC5121_ADS
bool "Freescale MPC5121E ADS" bool "Freescale MPC5121E ADS"
depends on PPC_MPC512x depends on PPC_MPC512x
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MPC5121_ADS_CPLD
help help
This option enables support for the MPC5121E ADS board. This option enables support for the MPC5121E ADS board.

1
arch/s390/Kconfig
View File

@ -87,7 +87,6 @@ config S390
select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZMA
select HAVE_KERNEL_LZO select HAVE_KERNEL_LZO
select HAVE_KERNEL_XZ select HAVE_KERNEL_XZ
select HAVE_GET_USER_PAGES_FAST
select HAVE_ARCH_MUTEX_CPU_RELAX select HAVE_ARCH_MUTEX_CPU_RELAX
select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
select HAVE_RCU_TABLE_FREE if SMP select HAVE_RCU_TABLE_FREE if SMP

2
arch/sparc/kernel/smp_64.c
View File

@ -840,7 +840,7 @@ static void tsb_sync(void *info)
struct trap_per_cpu *tp = &trap_block[raw_smp_processor_id()]; struct trap_per_cpu *tp = &trap_block[raw_smp_processor_id()];
struct mm_struct *mm = info; struct mm_struct *mm = info;
/* It is not valid to test "currrent->active_mm == mm" here. /* It is not valid to test "current->active_mm == mm" here.
* *
* The value of "current" is not changed atomically with * The value of "current" is not changed atomically with
* switch_mm(). But that's OK, we just need to check the * switch_mm(). But that's OK, we just need to check the

2
arch/x86/pci/pcbios.c
View File

@ -44,7 +44,7 @@ static inline void set_bios_x(void)
pcibios_enabled = 1; pcibios_enabled = 1;
set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT); set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT);
if (__supported_pte_mask & _PAGE_NX) if (__supported_pte_mask & _PAGE_NX)
printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n"); printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");
} }
/* /*

2
crypto/Kconfig
View File

@ -329,7 +329,6 @@ config CRYPTO_CRC32C_INTEL
config CRYPTO_GHASH config CRYPTO_GHASH
tristate "GHASH digest algorithm" tristate "GHASH digest algorithm"
select CRYPTO_SHASH
select CRYPTO_GF128MUL select CRYPTO_GF128MUL
help help
GHASH is message digest algorithm for GCM (Galois/Counter Mode). GHASH is message digest algorithm for GCM (Galois/Counter Mode).
@ -477,7 +476,6 @@ config CRYPTO_WP512
config CRYPTO_GHASH_CLMUL_NI_INTEL config CRYPTO_GHASH_CLMUL_NI_INTEL
tristate "GHASH digest algorithm (CLMUL-NI accelerated)" tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
depends on X86 && 64BIT depends on X86 && 64BIT
select CRYPTO_SHASH
select CRYPTO_CRYPTD select CRYPTO_CRYPTD
help help
GHASH is message digest algorithm for GCM (Galois/Counter Mode). GHASH is message digest algorithm for GCM (Galois/Counter Mode).

2
drivers/acpi/Kconfig
View File

@ -374,7 +374,7 @@ config ACPI_CUSTOM_METHOD
depends on DEBUG_FS depends on DEBUG_FS
default n default n
help help
This debug facility allows ACPI AML methods to me inserted and/or This debug facility allows ACPI AML methods to be inserted and/or
replaced without rebooting the system. For details refer to: replaced without rebooting the system. For details refer to:
Documentation/acpi/method-customizing.txt. Documentation/acpi/method-customizing.txt.

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

@ -356,7 +356,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register)
* *
* PARAMETERS: register_id - ID of ACPI Bit Register to access * PARAMETERS: register_id - ID of ACPI Bit Register to access
* Value - Value to write to the register, in bit * Value - Value to write to the register, in bit
* position zero. The bit is automaticallly * position zero. The bit is automatically
* shifted to the correct position. * shifted to the correct position.
* *
* RETURN: Status * RETURN: Status

2
drivers/base/devres.c
View File

@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(devm_kzalloc);
* @dev: Device this memory belongs to * @dev: Device this memory belongs to
* @p: Memory to free * @p: Memory to free
* *
* Free memory allocated with dev_kzalloc(). * Free memory allocated with devm_kzalloc().
*/ */
void devm_kfree(struct device *dev, void *p) void devm_kfree(struct device *dev, void *p)
{ {

2
drivers/block/xen-blkback/xenbus.c
View File

@ -613,7 +613,7 @@ static void frontend_changed(struct xenbus_device *dev,
case XenbusStateConnected: case XenbusStateConnected:
/* /*
* Ensure we connect even when two watches fire in * Ensure we connect even when two watches fire in
* close successsion and we miss the intermediate value * close succession and we miss the intermediate value
* of frontend_state. * of frontend_state.
*/ */
if (dev->state == XenbusStateConnected) if (dev->state == XenbusStateConnected)

2
drivers/char/ipmi/ipmi_bt_sm.c
View File

@ -560,7 +560,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
BT_CONTROL(BT_H_BUSY); /* set */ BT_CONTROL(BT_H_BUSY); /* set */
/* /*
* Uncached, ordered writes should just proceeed serially but * Uncached, ordered writes should just proceed serially but
* some BMCs don't clear B2H_ATN with one hit. Fast-path a * some BMCs don't clear B2H_ATN with one hit. Fast-path a
* workaround without too much penalty to the general case. * workaround without too much penalty to the general case.
*/ */

30
drivers/edac/i82975x_edac.c
View File

@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci,
static int i82975x_process_error_info(struct mem_ctl_info *mci, static int i82975x_process_error_info(struct mem_ctl_info *mci,
struct i82975x_error_info *info, int handle_errors) struct i82975x_error_info *info, int handle_errors)
{ {
int row, multi_chan, chan; int row, chan;
unsigned long offst, page; unsigned long offst, page;
multi_chan = mci->csrows[0].nr_channels - 1;
if (!(info->errsts2 & 0x0003)) if (!(info->errsts2 & 0x0003))
return 0; return 0;
@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
} }
page = (unsigned long) info->eap; page = (unsigned long) info->eap;
if (info->xeap & 1)
page |= 0x100000000ul;
chan = page & 1;
page >>= 1; page >>= 1;
offst = page & ((1 << PAGE_SHIFT) - 1); if (info->xeap & 1)
page >>= PAGE_SHIFT; page |= 0x80000000;
page >>= (PAGE_SHIFT - 1);
row = edac_mc_find_csrow_by_page(mci, page); row = edac_mc_find_csrow_by_page(mci, page);
if (row == -1) {
i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n"
"\tXEAP=%u\n"
"\t EAP=0x%08x\n"
"\tPAGE=0x%08x\n",
(info->xeap & 1) ? 1 : 0, info->eap, (unsigned int) page);
return 0;
}
chan = (mci->csrows[row].nr_channels == 1) ? 0 : info->eap & 1;
offst = info->eap
& ((1 << PAGE_SHIFT) -
(1 << mci->csrows[row].grain));
if (info->errsts & 0x0002) if (info->errsts & 0x0002)
edac_mc_handle_ue(mci, page, offst , row, "i82975x UE"); edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");
else else
edac_mc_handle_ce(mci, page, offst, info->derrsyn, row, edac_mc_handle_ce(mci, page, offst, info->derrsyn, row,
multi_chan ? chan : 0, chan, "i82975x CE");
"i82975x CE");
return 1; return 1;
} }
@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
csrow->last_page = cumul_size - 1; csrow->last_page = cumul_size - 1;
csrow->nr_pages = cumul_size - last_cumul_size; csrow->nr_pages = cumul_size - last_cumul_size;
last_cumul_size = cumul_size; last_cumul_size = cumul_size;
csrow->grain = 1 << 6; /* I82975X_EAP has 64B resolution */ csrow->grain = 1 << 7; /* 128Byte cache-line resolution */
csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */ csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */
csrow->dtype = i82975x_dram_type(mch_window, index); csrow->dtype = i82975x_dram_type(mch_window, index);
csrow->edac_mode = EDAC_SECDED; /* only supported */ csrow->edac_mode = EDAC_SECDED; /* only supported */

2
drivers/edac/ppc4xx_edac.c
View File

@ -142,7 +142,7 @@
/* /*
* The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are
* indirectly acccessed and have a base and length defined by the * indirectly accessed and have a base and length defined by the
* device tree. The base can be anything; however, we expect the * device tree. The base can be anything; however, we expect the
* length to be precisely two registers, the first for the address * length to be precisely two registers, the first for the address
* window and the second for the data window. * window and the second for the data window.

2
drivers/gpio/Kconfig
View File

@ -356,7 +356,7 @@ comment "PCI GPIO expanders:"
config GPIO_CS5535 config GPIO_CS5535
tristate "AMD CS5535/CS5536 GPIO support" tristate "AMD CS5535/CS5536 GPIO support"
depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535 depends on PCI && X86 && MFD_CS5535
help help
The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
can be used for quite a number of things. The CS5535/6 is found on can be used for quite a number of things. The CS5535/6 is found on

2
drivers/gpu/drm/i915/intel_sdvo_regs.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2006-2007 Intel Corporation * Copyright © 2006-2007 Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

4
drivers/hid/hid-pl.c
View File

@ -9,10 +9,10 @@
* - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT) * - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)
* *
* 0e8f:0003 "GreenAsia Inc. USB Joystick " * 0e8f:0003 "GreenAsia Inc. USB Joystick "
* - tested with König Gaming gamepad * - tested with König Gaming gamepad
* *
* 0e8f:0003 "GASIA USB Gamepad" * 0e8f:0003 "GASIA USB Gamepad"
* - another version of the König gamepad * - another version of the König gamepad
* *
* Copyright (c) 2007, 2009 Anssi Hannula <anssi.hannula@gmail.com> * Copyright (c) 2007, 2009 Anssi Hannula <anssi.hannula@gmail.com>
*/ */

2
drivers/hid/hid-twinhan.c
View File

@ -3,7 +3,7 @@
* *
* Based on hid-gyration.c * Based on hid-gyration.c
* *
* Copyright (c) 2009 Bruno Prémont <bonbons@linux-vserver.org> * Copyright (c) 2009 Bruno Prémont <bonbons@linux-vserver.org>
*/ */
/* /*

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

@ -426,7 +426,7 @@ static void xiic_process(struct xiic_i2c *i2c)
xiic_wakeup(i2c, STATE_ERROR); xiic_wakeup(i2c, STATE_ERROR);
} else if (pend & (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) { } else if (pend & (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) {
/* Transmit register/FIFO is empty or ½ empty */ /* Transmit register/FIFO is empty or ½ empty */
clr = pend & clr = pend &
(XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK); (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK);

2
drivers/isdn/hisax/enternow_pci.c
View File

@ -333,7 +333,7 @@ static void __devinit en_cs_init(struct IsdnCard *card,
cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD
/* Reset an */ /* Reset an */
cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff
outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
/* 20 ms Pause */ /* 20 ms Pause */
mdelay(20); mdelay(20);

3
drivers/leds/Kconfig
View File

@ -347,7 +347,8 @@ config LEDS_MC13783
config LEDS_NS2 config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs" tristate "LED support for Network Space v2 GPIO LEDs"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2 depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \
MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2
default y default y
help help
This option enable support for the dual-GPIO LED found on the This option enable support for the dual-GPIO LED found on the

2
drivers/media/rc/ene_ir.c
View File

@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev)
return dev->extra_buf2_address + r_pointer; return dev->extra_buf2_address + r_pointer;
} }
dbg("attempt to read beyong ring bufer end"); dbg("attempt to read beyond ring buffer end");
return 0; return 0;
} }

2
drivers/media/rc/ene_ir.h
View File

@ -227,7 +227,7 @@ struct ene_device {
/* TX buffer */ /* TX buffer */
unsigned *tx_buffer; /* input samples buffer*/ unsigned *tx_buffer; /* input samples buffer*/
int tx_pos; /* position in that bufer */ int tx_pos; /* position in that buffer */
int tx_len; /* current len of tx buffer */ int tx_len; /* current len of tx buffer */
int tx_done; /* done transmitting */ int tx_done; /* done transmitting */
/* one more sample pending*/ /* one more sample pending*/

2
drivers/media/rc/winbond-cir.c
View File

@ -1176,6 +1176,6 @@ wbcir_exit(void)
module_init(wbcir_init); module_init(wbcir_init);
module_exit(wbcir_exit); module_exit(wbcir_exit);
MODULE_AUTHOR("David Härdeman <david@hardeman.nu>"); MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver"); MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/media/video/zoran/zoran_driver.c
View File

@ -1550,7 +1550,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)
if (zoran_formats[i].flags & flag && num++ == fmt->index) { if (zoran_formats[i].flags & flag && num++ == fmt->index) {
strncpy(fmt->description, zoran_formats[i].name, strncpy(fmt->description, zoran_formats[i].name,
sizeof(fmt->description) - 1); sizeof(fmt->description) - 1);
/* fmt struct pre-zeroed, so adding '\0' not neeed */ /* fmt struct pre-zeroed, so adding '\0' not needed */
fmt->pixelformat = zoran_formats[i].fourcc; fmt->pixelformat = zoran_formats[i].fourcc;
if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED)
fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;

2
drivers/message/fusion/lsi/mpi_ioc.h
View File

@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY
#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000)
#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16)
/* SAS Discovery Errror Event data */ /* SAS Discovery Error Event data */
typedef struct _EVENT_DATA_DISCOVERY_ERROR typedef struct _EVENT_DATA_DISCOVERY_ERROR
{ {

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

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

2
drivers/misc/ibmasm/dot_command.h
View File

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

2
drivers/misc/ibmasm/i2o.h
View File

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

2
drivers/misc/ibmasm/ibmasm.h
View File

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

2
drivers/misc/ibmasm/lowlevel.h
View File

@ -17,7 +17,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

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

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
* This driver is based on code originally written by Pete Reynolds * This driver is based on code originally written by Pete Reynolds
* and others. * and others.

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

@ -16,7 +16,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

2
drivers/misc/ibmasm/remote.h
View File

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
* Originally written by Pete Reynolds * Originally written by Pete Reynolds
*/ */

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

@ -18,7 +18,7 @@
* *
* Copyright (C) IBM Corporation, 2004 * Copyright (C) IBM Corporation, 2004
* *
* Author: Max Asböck <amax@us.ibm.com> * Author: Max Asböck <amax@us.ibm.com>
* *
*/ */

4
drivers/mmc/host/omap.c
View File

@ -2,7 +2,7 @@
* linux/drivers/mmc/host/omap.c * linux/drivers/mmc/host/omap.c
* *
* Copyright (C) 2004 Nokia Corporation * Copyright (C) 2004 Nokia Corporation
* Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com> * Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com>
* Misc hacks here and there by Tony Lindgren <tony@atomide.com> * Misc hacks here and there by Tony Lindgren <tony@atomide.com>
* Other hacks (DMA, SD, etc) by David Brownell * Other hacks (DMA, SD, etc) by David Brownell
* *
@ -1634,4 +1634,4 @@ module_exit(mmc_omap_exit);
MODULE_DESCRIPTION("OMAP Multimedia Card driver"); MODULE_DESCRIPTION("OMAP Multimedia Card driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
MODULE_AUTHOR("Juha Yrjölä"); MODULE_AUTHOR("Juha Yrjölä");

1
drivers/mtd/nand/Kconfig
View File

@ -420,7 +420,6 @@ config MTD_NAND_NANDSIM
config MTD_NAND_GPMI_NAND config MTD_NAND_GPMI_NAND
bool "GPMI NAND Flash Controller driver" bool "GPMI NAND Flash Controller driver"
depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28) depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28)
select MTD_PARTITIONS
select MTD_CMDLINE_PARTS select MTD_CMDLINE_PARTS
help help
Enables NAND Flash support for IMX23 or IMX28. Enables NAND Flash support for IMX23 or IMX28.

2
drivers/net/ethernet/chelsio/cxgb4vf/sge.c
View File

@ -683,7 +683,7 @@ out:
/* /*
* Update our accounting state to incorporate the new Free List * Update our accounting state to incorporate the new Free List
* buffers, tell the hardware about them and return the number of * buffers, tell the hardware about them and return the number of
* bufers which we were able to allocate. * buffers which we were able to allocate.
*/ */
cred = fl->avail - cred; cred = fl->avail - cred;
fl->pend_cred += cred; fl->pend_cred += cred;

2
drivers/net/ethernet/sis/sis900.h
View File

@ -205,7 +205,7 @@ enum sis900_tx_buffer_status {
EXCCOLL = 0x00100000, COLCNT = 0x000F0000 EXCCOLL = 0x00100000, COLCNT = 0x000F0000
}; };
enum sis900_rx_bufer_status { enum sis900_rx_buffer_status {
OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000,
MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000,
RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000,

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

@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self)
switch_bank(iobase, BANK0); switch_bank(iobase, BANK0);
outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR); outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR);
/* Check for underrrun! */ /* Check for underrun! */
if (inb(iobase+ASCR) & ASCR_TXUR) { if (inb(iobase+ASCR) & ASCR_TXUR) {
self->netdev->stats.tx_errors++; self->netdev->stats.tx_errors++;
self->netdev->stats.tx_fifo_errors++; self->netdev->stats.tx_fifo_errors++;

4
drivers/net/irda/via-ircc.c
View File

@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
iobase = self->io.fir_base; iobase = self->io.fir_base;
/* Disable DMA */ /* Disable DMA */
// DisableDmaChannel(self->io.dma); // DisableDmaChannel(self->io.dma);
/* Check for underrrun! */ /* Check for underrun! */
/* Clear bit, by writing 1 into it */ /* Clear bit, by writing 1 into it */
Tx_status = GetTXStatus(iobase); Tx_status = GetTXStatus(iobase);
if (Tx_status & 0x08) { if (Tx_status & 0x08) {
self->netdev->stats.tx_errors++; self->netdev->stats.tx_errors++;
self->netdev->stats.tx_fifo_errors++; self->netdev->stats.tx_fifo_errors++;
hwreset(self); hwreset(self);
// how to clear underrrun ? /* how to clear underrun? */
} else { } else {
self->netdev->stats.tx_packets++; self->netdev->stats.tx_packets++;
ResetChip(iobase, 3); ResetChip(iobase, 3);

2
drivers/net/irda/w83977af_ir.c
View File

@ -677,7 +677,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
switch_bank(iobase, SET0); switch_bank(iobase, SET0);
outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR);
/* Check for underrrun! */ /* Check for underrun! */
if (inb(iobase+AUDR) & AUDR_UNDR) { if (inb(iobase+AUDR) & AUDR_UNDR) {
IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ );

2
drivers/net/wimax/i2400m/i2400m.h
View File

@ -75,7 +75,7 @@
* device is up and running or shutdown (through ifconfig up / * device is up and running or shutdown (through ifconfig up /
* down). Bus-generic only. * down). Bus-generic only.
* *
* - control ops: control.c - implements various commmands for * - control ops: control.c - implements various commands for
* controlling the device. bus-generic only. * controlling the device. bus-generic only.
* *
* - device model glue: driver.c - implements helpers for the * - device model glue: driver.c - implements helpers for the

4
drivers/net/wireless/rtlwifi/rtl8192de/hw.c
View File

@ -466,8 +466,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
bool int_migration = *(bool *) (val); bool int_migration = *(bool *) (val);
if (int_migration) { if (int_migration) {
/* Set interrrupt migration timer and /* Set interrupt migration timer and
* corresponging Tx/Rx counter. * corresponding Tx/Rx counter.
* timer 25ns*0xfa0=100us for 0xf packets. * timer 25ns*0xfa0=100us for 0xf packets.
* 0x306:Rx, 0x307:Tx */ * 0x306:Rx, 0x307:Tx */
rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0); rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0);

7
drivers/parisc/Kconfig
View File

@ -108,13 +108,6 @@ config IOMMU_HELPER
depends on IOMMU_SBA || IOMMU_CCIO depends on IOMMU_SBA || IOMMU_CCIO
default y default y
#config PCI_EPIC
# bool "EPIC/SAGA PCI support"
# depends on PCI
# default y
# help
# Say Y here for V-class PCI, DMA/IOMMU, IRQ subsystem support.
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig" source "drivers/pci/hotplug/Kconfig"

2
drivers/parport/parport_mfc3.c
View File

@ -397,7 +397,7 @@ static void __exit parport_mfc3_exit(void)
MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>"); MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port"); MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Parallel Port");
MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port"); MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/scsi/aic7xxx/aicasm/aicasm.c
View File

@ -1,5 +1,5 @@
/* /*
* Aic7xxx SCSI host adapter firmware asssembler * Aic7xxx SCSI host adapter firmware assembler
* *
* Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs. * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
* Copyright (c) 2001, 2002 Adaptec Inc. * Copyright (c) 2001, 2002 Adaptec Inc.

2
drivers/scsi/gdth.h
View File

@ -359,7 +359,7 @@ typedef struct {
u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */ u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */
u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */ u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */
u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */ u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */
u32 cmd_buff_size; /* size of each cmd bufer in bytes */ u32 cmd_buff_size; /* size of each cmd buffer in bytes */
u32 reserved1; u32 reserved1;
u32 reserved2; u32 reserved2;
} __attribute__((packed)) gdth_perf_modes; } __attribute__((packed)) gdth_perf_modes;

2
drivers/scsi/ips.c
View File

@ -4494,7 +4494,7 @@ ips_init_scb(ips_ha_t * ha, ips_scb_t * scb)
/* */ /* */
/* Initialize a CCB to default values */ /* Initialize a CCB to default values */
/* */ /* */
/* ASSUMED to be callled from within a lock */ /* ASSUMED to be called from within a lock */
/* */ /* */
/****************************************************************************/ /****************************************************************************/
static ips_scb_t * static ips_scb_t *

2
drivers/scsi/jazz_esp.c
View File

@ -1,6 +1,6 @@
/* jazz_esp.c: ESP front-end for MIPS JAZZ systems. /* jazz_esp.c: ESP front-end for MIPS JAZZ systems.
* *
* Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende) * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>

2
drivers/scsi/pmcraid.c
View File

@ -4105,7 +4105,7 @@ static long pmcraid_chr_ioctl(
hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL); hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL);
if (!hdr) { if (!hdr) {
pmcraid_err("faile to allocate memory for ioctl header\n"); pmcraid_err("failed to allocate memory for ioctl header\n");
return -ENOMEM; return -ENOMEM;
} }

2
drivers/scsi/qla2xxx/qla_nx.c
View File

@ -1055,7 +1055,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)
"ROM lock failed.\n"); "ROM lock failed.\n");
return -1; return -1;
} }
return 0;; return 0;
} }
static int static int

2
drivers/scsi/qla4xxx/ql4_fw.h
View File

@ -752,7 +752,7 @@ struct dev_db_entry {
uint8_t res4[0x36]; /* 8A-BF */ uint8_t res4[0x36]; /* 8A-BF */
uint8_t iscsi_name[0xE0]; /* C0-19F : xxzzy Make this a uint8_t iscsi_name[0xE0]; /* C0-19F : xxzzy Make this a
* pointer to a string so we * pointer to a string so we
* don't have to reserve soooo * don't have to reserve so
* much RAM */ * much RAM */
uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */ uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */
uint8_t res5[0x10]; /* 1B0-1BF */ uint8_t res5[0x10]; /* 1B0-1BF */

2
drivers/scsi/sni_53c710.c
View File

@ -51,7 +51,7 @@
#include "53c700.h" #include "53c700.h"
MODULE_AUTHOR("Thomas Bogendörfer"); MODULE_AUTHOR("Thomas Bogendörfer");
MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver"); MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:snirm_53c710"); MODULE_ALIAS("platform:snirm_53c710");

2
drivers/scsi/vmw_pvscsi.c
View File

@ -1144,7 +1144,7 @@ static void pvscsi_release_resources(struct pvscsi_adapter *adapter)
* *
* These are statically allocated. Trying to be clever was not worth it. * These are statically allocated. Trying to be clever was not worth it.
* *
* Dynamic allocation can fail, and we can't go deeep into the memory * Dynamic allocation can fail, and we can't go deep into the memory
* allocator, since we're a SCSI driver, and trying too hard to allocate * allocator, since we're a SCSI driver, and trying too hard to allocate
* memory might generate disk I/O. We also don't want to fail disk I/O * memory might generate disk I/O. We also don't want to fail disk I/O
* in that case because we can't get an allocation - the I/O could be * in that case because we can't get an allocation - the I/O could be

3
drivers/spi/Kconfig
View File

@ -174,8 +174,7 @@ config SPI_LM70_LLP
config SPI_MPC52xx config SPI_MPC52xx
tristate "Freescale MPC52xx SPI (non-PSC) controller support" tristate "Freescale MPC52xx SPI (non-PSC) controller support"
depends on PPC_MPC52xx && SPI depends on PPC_MPC52xx
select SPI_MASTER_OF
help help
This drivers supports the MPC52xx SPI controller in master SPI This drivers supports the MPC52xx SPI controller in master SPI
mode. mode.

4
drivers/staging/bcm/target_params.h
View File

@ -72,8 +72,8 @@ typedef struct _TARGET_PARAMS
// removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files.. // removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files..
//BAMC Related Parameters //BAMC Related Parameters
//Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling. //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling.
//bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support. //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.
B_UINT32 m_u32BandAMCEnable; B_UINT32 m_u32BandAMCEnable;
} stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS; } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;

2
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View File

@ -3598,7 +3598,7 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
n = comedi_buf_write_alloc(s->async, n = comedi_buf_write_alloc(s->async,
(7 + 12) * sizeof(unsigned int)); (7 + 12) * sizeof(unsigned int));
/* If not enougth memory available, event is set to Comedi Buffer Errror */ /* If not enough memory available, event is set to Comedi Buffer Error */
if (n > ((7 + 12) * sizeof(unsigned int))) { if (n > ((7 + 12) * sizeof(unsigned int))) {
printk("\ncomedi_buf_write_alloc n = %i", n); printk("\ncomedi_buf_write_alloc n = %i", n);
s->async->events |= COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_ERROR;

2
drivers/staging/cxt1e1/libsbew.h
View File

@ -323,7 +323,7 @@ struct sbecom_port_param
#define CFG_CH_DINV_TX 0x02 #define CFG_CH_DINV_TX 0x02
/* Posssible resettable chipsets/functions */ /* Possible resettable chipsets/functions */
#define RESET_DEV_TEMUX 1 #define RESET_DEV_TEMUX 1
#define RESET_DEV_TECT3 RESET_DEV_TEMUX #define RESET_DEV_TECT3 RESET_DEV_TEMUX
#define RESET_DEV_PLL 2 #define RESET_DEV_PLL 2

4
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
View File

@ -344,10 +344,10 @@ static void ft1000_reset_asic(struct net_device *dev)
} }
mdelay(1); mdelay(1);
if (info->AsicID == ELECTRABUZZ_ID) { if (info->AsicID == ELECTRABUZZ_ID) {
// set watermark to -1 in order to not generate an interrrupt // set watermark to -1 in order to not generate an interrupt
ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0xffff); ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0xffff);
} else { } else {
// set watermark to -1 in order to not generate an interrrupt // set watermark to -1 in order to not generate an interrupt
ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0xffff); ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0xffff);
} }
// clear interrupts // clear interrupts

2
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View File

@ -601,7 +601,7 @@ static void ft1000_reset_asic(struct net_device *dev)
mdelay(1); mdelay(1);
/* set watermark to -1 in order to not generate an interrrupt */ /* set watermark to -1 in order to not generate an interrupt */
ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK); ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK);
/* clear interrupts */ /* clear interrupts */

2
drivers/staging/iio/industrialio-trigger.c
View File

@ -295,7 +295,7 @@ void iio_dealloc_pollfunc(struct iio_poll_func *pf)
EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc); EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc);
/** /**
* iio_trigger_read_currrent() - trigger consumer sysfs query which trigger * iio_trigger_read_current() - trigger consumer sysfs query which trigger
* *
* For trigger consumers the current_trigger interface allows the trigger * For trigger consumers the current_trigger interface allows the trigger
* used by the device to be queried. * used by the device to be queried.

4
drivers/staging/keucr/smilmain.c
View File

@ -148,7 +148,7 @@ int Media_D_ReadSector(struct us_data *us, DWORD start,WORD count,BYTE *buf)
{ {
WORD len, bn; WORD len, bn;
//if (Check_D_MediaPower()) ; 在 6250 don't care //if (Check_D_MediaPower()) ; ¦b 6250 don't care
// return(ErrCode); // return(ErrCode);
//if (Check_D_MediaFmt(fdoExt)) ; //if (Check_D_MediaFmt(fdoExt)) ;
// return(ErrCode); // return(ErrCode);
@ -594,7 +594,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
// if (Check_D_CardStsChg()) // if (Check_D_CardStsChg())
// MediaChange = ERROR; // MediaChange = ERROR;
// //usleep(56*1024); // //usleep(56*1024);
// if ((!Check_D_CntPower())&&(!MediaChange)) // 有 power & Media 沒被 change, 則 return success // if ((!Check_D_CntPower())&&(!MediaChange)) // ¦³ power & Media ¨S³Q change, «h return success
// return(SMSUCCESS); // return(SMSUCCESS);
// //usleep(56*1024); // //usleep(56*1024);
// //

2
drivers/staging/sep/sep_driver.c
View File

@ -1235,7 +1235,7 @@ static void sep_build_lli_table(struct sep_device *sep,
/* Counter of lli array entry */ /* Counter of lli array entry */
u32 array_counter; u32 array_counter;
/* Init currrent table data size and lli array entry counter */ /* Init current table data size and lli array entry counter */
curr_table_data_size = 0; curr_table_data_size = 0;
array_counter = 0; array_counter = 0;
*num_table_entries_ptr = 1; *num_table_entries_ptr = 1;

2
drivers/staging/tidspbridge/Kconfig
View File

@ -78,7 +78,7 @@ config TIDSPBRIDGE_NTFY_PWRERR
bool "Notify power errors" bool "Notify power errors"
depends on TIDSPBRIDGE depends on TIDSPBRIDGE
help help
Enable notifications to registered clients on the event of power errror Enable notifications to registered clients on the event of power error
trying to suspend bridge driver. Say Y, to signal this event as a fatal trying to suspend bridge driver. Say Y, to signal this event as a fatal
error, this will require a bridge restart to recover. error, this will require a bridge restart to recover.

2
drivers/staging/tidspbridge/rmgr/dbdcd.c
View File

@ -285,7 +285,7 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
enum_refs = 0; enum_refs = 0;
/* /*
* TODO: Revisit, this is not an errror case but code * TODO: Revisit, this is not an error case but code
* expects non-zero value. * expects non-zero value.
*/ */
status = ENODATA; status = ENODATA;

2
drivers/staging/wlags49_h2/debug.h
View File

@ -43,7 +43,7 @@
* *
* Disclaimer * Disclaimer
* *
* THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN

2
drivers/staging/wlags49_h2/dhfcfg.h
View File

@ -43,7 +43,7 @@
* *
* Disclaimer * Disclaimer
* *
* THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN

6
drivers/staging/wlags49_h2/hcf.c
View File

@ -32,9 +32,9 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved
* COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

6
drivers/staging/wlags49_h2/hcf.h
View File

@ -40,9 +40,9 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved
* COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

6
drivers/staging/wlags49_h2/hcfcfg.h
View File

@ -64,9 +64,9 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved
* COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

6
drivers/staging/wlags49_h2/hcfdef.h
View File

@ -33,9 +33,9 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved
* COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

6
drivers/staging/wlags49_h2/mdd.h
View File

@ -33,9 +33,9 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved
* COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

2
drivers/staging/wlags49_h2/mmd.c
View File

@ -35,7 +35,7 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

2
drivers/staging/wlags49_h2/mmd.h
View File

@ -33,7 +33,7 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without

4
drivers/staging/wlags49_h2/wl_cs.h
View File

@ -22,7 +22,7 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* Copyright © 2003 Agere Systems Inc. * Copyright © 2003 Agere Systems Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without
@ -43,7 +43,7 @@
* *
* Disclaimer * Disclaimer
* *
* THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN

4
drivers/staging/wlags49_h2/wl_enc.c
View File

@ -23,7 +23,7 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* Copyright © 2003 Agere Systems Inc. * Copyright © 2003 Agere Systems Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without
@ -44,7 +44,7 @@
* *
* Disclaimer * Disclaimer
* *
* THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN

4
drivers/staging/wlags49_h2/wl_enc.h
View File

@ -22,7 +22,7 @@
* software indicates your acceptance of these terms and conditions. If you do * software indicates your acceptance of these terms and conditions. If you do
* not agree with these terms and conditions, do not use the software. * not agree with these terms and conditions, do not use the software.
* *
* Copyright © 2003 Agere Systems Inc. * Copyright © 2003 Agere Systems Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source or binary forms, with or without * Redistribution and use in source or binary forms, with or without
@ -43,7 +43,7 @@
* *
* Disclaimer * Disclaimer
* *
* THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN

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