diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /drivers | |
parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
parent | bd1b2a555952d959f47169056fca05acf7eff81f (diff) |
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: (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)
Diffstat (limited to 'drivers')
112 files changed, 168 insertions, 171 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index de0e3df76776..7556913aba45 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -374,7 +374,7 @@ config ACPI_CUSTOM_METHOD | |||
374 | depends on DEBUG_FS | 374 | depends on DEBUG_FS |
375 | default n | 375 | default n |
376 | help | 376 | help |
377 | This debug facility allows ACPI AML methods to me inserted and/or | 377 | This debug facility allows ACPI AML methods to be inserted and/or |
378 | replaced without rebooting the system. For details refer to: | 378 | replaced without rebooting the system. For details refer to: |
379 | Documentation/acpi/method-customizing.txt. | 379 | Documentation/acpi/method-customizing.txt. |
380 | 380 | ||
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index c2793a82f120..d707756228c2 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c | |||
@@ -356,7 +356,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register) | |||
356 | * | 356 | * |
357 | * PARAMETERS: register_id - ID of ACPI Bit Register to access | 357 | * PARAMETERS: register_id - ID of ACPI Bit Register to access |
358 | * Value - Value to write to the register, in bit | 358 | * Value - Value to write to the register, in bit |
359 | * position zero. The bit is automaticallly | 359 | * position zero. The bit is automatically |
360 | * shifted to the correct position. | 360 | * shifted to the correct position. |
361 | * | 361 | * |
362 | * RETURN: Status | 362 | * RETURN: Status |
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 65cd74832450..524bf96c289f 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c | |||
@@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(devm_kzalloc); | |||
639 | * @dev: Device this memory belongs to | 639 | * @dev: Device this memory belongs to |
640 | * @p: Memory to free | 640 | * @p: Memory to free |
641 | * | 641 | * |
642 | * Free memory allocated with dev_kzalloc(). | 642 | * Free memory allocated with devm_kzalloc(). |
643 | */ | 643 | */ |
644 | void devm_kfree(struct device *dev, void *p) | 644 | void devm_kfree(struct device *dev, void *p) |
645 | { | 645 | { |
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index f759ad4584c3..8069322e4c9e 100644 --- a/drivers/block/xen-blkback/xenbus.c +++ b/drivers/block/xen-blkback/xenbus.c | |||
@@ -613,7 +613,7 @@ static void frontend_changed(struct xenbus_device *dev, | |||
613 | case XenbusStateConnected: | 613 | case XenbusStateConnected: |
614 | /* | 614 | /* |
615 | * Ensure we connect even when two watches fire in | 615 | * Ensure we connect even when two watches fire in |
616 | * close successsion and we miss the intermediate value | 616 | * close succession and we miss the intermediate value |
617 | * of frontend_state. | 617 | * of frontend_state. |
618 | */ | 618 | */ |
619 | if (dev->state == XenbusStateConnected) | 619 | if (dev->state == XenbusStateConnected) |
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index 3ed20e8abc0d..cdd4c09fda96 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c | |||
@@ -560,7 +560,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time) | |||
560 | BT_CONTROL(BT_H_BUSY); /* set */ | 560 | BT_CONTROL(BT_H_BUSY); /* set */ |
561 | 561 | ||
562 | /* | 562 | /* |
563 | * Uncached, ordered writes should just proceeed serially but | 563 | * Uncached, ordered writes should just proceed serially but |
564 | * some BMCs don't clear B2H_ATN with one hit. Fast-path a | 564 | * some BMCs don't clear B2H_ATN with one hit. Fast-path a |
565 | * workaround without too much penalty to the general case. | 565 | * workaround without too much penalty to the general case. |
566 | */ | 566 | */ |
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index a5da732fe5b2..4184e0171f00 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c | |||
@@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci, | |||
277 | static int i82975x_process_error_info(struct mem_ctl_info *mci, | 277 | static int i82975x_process_error_info(struct mem_ctl_info *mci, |
278 | struct i82975x_error_info *info, int handle_errors) | 278 | struct i82975x_error_info *info, int handle_errors) |
279 | { | 279 | { |
280 | int row, multi_chan, chan; | 280 | int row, chan; |
281 | unsigned long offst, page; | 281 | unsigned long offst, page; |
282 | 282 | ||
283 | multi_chan = mci->csrows[0].nr_channels - 1; | ||
284 | |||
285 | if (!(info->errsts2 & 0x0003)) | 283 | if (!(info->errsts2 & 0x0003)) |
286 | return 0; | 284 | return 0; |
287 | 285 | ||
@@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci, | |||
294 | } | 292 | } |
295 | 293 | ||
296 | page = (unsigned long) info->eap; | 294 | page = (unsigned long) info->eap; |
297 | if (info->xeap & 1) | ||
298 | page |= 0x100000000ul; | ||
299 | chan = page & 1; | ||
300 | page >>= 1; | 295 | page >>= 1; |
301 | offst = page & ((1 << PAGE_SHIFT) - 1); | 296 | if (info->xeap & 1) |
302 | page >>= PAGE_SHIFT; | 297 | page |= 0x80000000; |
298 | page >>= (PAGE_SHIFT - 1); | ||
303 | row = edac_mc_find_csrow_by_page(mci, page); | 299 | row = edac_mc_find_csrow_by_page(mci, page); |
304 | 300 | ||
301 | if (row == -1) { | ||
302 | i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n" | ||
303 | "\tXEAP=%u\n" | ||
304 | "\t EAP=0x%08x\n" | ||
305 | "\tPAGE=0x%08x\n", | ||
306 | (info->xeap & 1) ? 1 : 0, info->eap, (unsigned int) page); | ||
307 | return 0; | ||
308 | } | ||
309 | chan = (mci->csrows[row].nr_channels == 1) ? 0 : info->eap & 1; | ||
310 | offst = info->eap | ||
311 | & ((1 << PAGE_SHIFT) - | ||
312 | (1 << mci->csrows[row].grain)); | ||
313 | |||
305 | if (info->errsts & 0x0002) | 314 | if (info->errsts & 0x0002) |
306 | edac_mc_handle_ue(mci, page, offst , row, "i82975x UE"); | 315 | edac_mc_handle_ue(mci, page, offst , row, "i82975x UE"); |
307 | else | 316 | else |
308 | edac_mc_handle_ce(mci, page, offst, info->derrsyn, row, | 317 | edac_mc_handle_ce(mci, page, offst, info->derrsyn, row, |
309 | multi_chan ? chan : 0, | 318 | chan, "i82975x CE"); |
310 | "i82975x CE"); | ||
311 | 319 | ||
312 | return 1; | 320 | return 1; |
313 | } | 321 | } |
@@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci, | |||
410 | csrow->last_page = cumul_size - 1; | 418 | csrow->last_page = cumul_size - 1; |
411 | csrow->nr_pages = cumul_size - last_cumul_size; | 419 | csrow->nr_pages = cumul_size - last_cumul_size; |
412 | last_cumul_size = cumul_size; | 420 | last_cumul_size = cumul_size; |
413 | csrow->grain = 1 << 6; /* I82975X_EAP has 64B resolution */ | 421 | csrow->grain = 1 << 7; /* 128Byte cache-line resolution */ |
414 | csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */ | 422 | csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */ |
415 | csrow->dtype = i82975x_dram_type(mch_window, index); | 423 | csrow->dtype = i82975x_dram_type(mch_window, index); |
416 | csrow->edac_mode = EDAC_SECDED; /* only supported */ | 424 | csrow->edac_mode = EDAC_SECDED; /* only supported */ |
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 38400963e245..fc757069c6af 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -142,7 +142,7 @@ | |||
142 | 142 | ||
143 | /* | 143 | /* |
144 | * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are | 144 | * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are |
145 | * indirectly acccessed and have a base and length defined by the | 145 | * indirectly accessed and have a base and length defined by the |
146 | * device tree. The base can be anything; however, we expect the | 146 | * device tree. The base can be anything; however, we expect the |
147 | * length to be precisely two registers, the first for the address | 147 | * length to be precisely two registers, the first for the address |
148 | * window and the second for the data window. | 148 | * window and the second for the data window. |
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 4e04157a3683..d476880c6fff 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -356,7 +356,7 @@ comment "PCI GPIO expanders:" | |||
356 | 356 | ||
357 | config GPIO_CS5535 | 357 | config GPIO_CS5535 |
358 | tristate "AMD CS5535/CS5536 GPIO support" | 358 | tristate "AMD CS5535/CS5536 GPIO support" |
359 | depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535 | 359 | depends on PCI && X86 && MFD_CS5535 |
360 | help | 360 | help |
361 | The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that | 361 | The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that |
362 | can be used for quite a number of things. The CS5535/6 is found on | 362 | can be used for quite a number of things. The CS5535/6 is found on |
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h index 4aa6f343e49a..6b7b22f4d63e 100644 --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright © 2006-2007 Intel Corporation | 2 | * Copyright © 2006-2007 Intel Corporation |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index 070f93a5c11b..47ed74c46b6b 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c | |||
@@ -9,10 +9,10 @@ | |||
9 | * - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT) | 9 | * - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT) |
10 | * | 10 | * |
11 | * 0e8f:0003 "GreenAsia Inc. USB Joystick " | 11 | * 0e8f:0003 "GreenAsia Inc. USB Joystick " |
12 | * - tested with König Gaming gamepad | 12 | * - tested with König Gaming gamepad |
13 | * | 13 | * |
14 | * 0e8f:0003 "GASIA USB Gamepad" | 14 | * 0e8f:0003 "GASIA USB Gamepad" |
15 | * - another version of the König gamepad | 15 | * - another version of the König gamepad |
16 | * | 16 | * |
17 | * Copyright (c) 2007, 2009 Anssi Hannula <anssi.hannula@gmail.com> | 17 | * Copyright (c) 2007, 2009 Anssi Hannula <anssi.hannula@gmail.com> |
18 | */ | 18 | */ |
diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c index c40afc57fc8f..f23456b1fd4b 100644 --- a/drivers/hid/hid-twinhan.c +++ b/drivers/hid/hid-twinhan.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Based on hid-gyration.c | 4 | * Based on hid-gyration.c |
5 | * | 5 | * |
6 | * Copyright (c) 2009 Bruno Prémont <bonbons@linux-vserver.org> | 6 | * Copyright (c) 2009 Bruno Prémont <bonbons@linux-vserver.org> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | /* | 9 | /* |
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 4bb68f35caf2..ac083a28ae08 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c | |||
@@ -426,7 +426,7 @@ static void xiic_process(struct xiic_i2c *i2c) | |||
426 | xiic_wakeup(i2c, STATE_ERROR); | 426 | xiic_wakeup(i2c, STATE_ERROR); |
427 | 427 | ||
428 | } else if (pend & (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) { | 428 | } else if (pend & (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) { |
429 | /* Transmit register/FIFO is empty or ½ empty */ | 429 | /* Transmit register/FIFO is empty or ½ empty */ |
430 | 430 | ||
431 | clr = pend & | 431 | clr = pend & |
432 | (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK); | 432 | (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK); |
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 26264abf1f58..f55d29d60826 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c | |||
@@ -333,7 +333,7 @@ static void __devinit en_cs_init(struct IsdnCard *card, | |||
333 | cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD | 333 | cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD |
334 | 334 | ||
335 | /* Reset an */ | 335 | /* Reset an */ |
336 | cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff | 336 | cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff |
337 | outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); | 337 | outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); |
338 | /* 20 ms Pause */ | 338 | /* 20 ms Pause */ |
339 | mdelay(20); | 339 | mdelay(20); |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index ff203a421863..1b75a56ebd08 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -347,7 +347,8 @@ config LEDS_MC13783 | |||
347 | config LEDS_NS2 | 347 | config LEDS_NS2 |
348 | tristate "LED support for Network Space v2 GPIO LEDs" | 348 | tristate "LED support for Network Space v2 GPIO LEDs" |
349 | depends on LEDS_CLASS | 349 | depends on LEDS_CLASS |
350 | depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2 | 350 | depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \ |
351 | MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2 | ||
351 | default y | 352 | default y |
352 | help | 353 | help |
353 | This option enable support for the dual-GPIO LED found on the | 354 | This option enable support for the dual-GPIO LED found on the |
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c index cf10ecf5acec..860c112e0fd2 100644 --- a/drivers/media/rc/ene_ir.c +++ b/drivers/media/rc/ene_ir.c | |||
@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev) | |||
324 | return dev->extra_buf2_address + r_pointer; | 324 | return dev->extra_buf2_address + r_pointer; |
325 | } | 325 | } |
326 | 326 | ||
327 | dbg("attempt to read beyong ring bufer end"); | 327 | dbg("attempt to read beyond ring buffer end"); |
328 | return 0; | 328 | return 0; |
329 | } | 329 | } |
330 | 330 | ||
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h index fd108d90f750..6f978e85db8c 100644 --- a/drivers/media/rc/ene_ir.h +++ b/drivers/media/rc/ene_ir.h | |||
@@ -227,7 +227,7 @@ struct ene_device { | |||
227 | 227 | ||
228 | /* TX buffer */ | 228 | /* TX buffer */ |
229 | unsigned *tx_buffer; /* input samples buffer*/ | 229 | unsigned *tx_buffer; /* input samples buffer*/ |
230 | int tx_pos; /* position in that bufer */ | 230 | int tx_pos; /* position in that buffer */ |
231 | int tx_len; /* current len of tx buffer */ | 231 | int tx_len; /* current len of tx buffer */ |
232 | int tx_done; /* done transmitting */ | 232 | int tx_done; /* done transmitting */ |
233 | /* one more sample pending*/ | 233 | /* one more sample pending*/ |
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c index 13f54b51194a..e7f7a57bf684 100644 --- a/drivers/media/rc/winbond-cir.c +++ b/drivers/media/rc/winbond-cir.c | |||
@@ -1176,6 +1176,6 @@ wbcir_exit(void) | |||
1176 | module_init(wbcir_init); | 1176 | module_init(wbcir_init); |
1177 | module_exit(wbcir_exit); | 1177 | module_exit(wbcir_exit); |
1178 | 1178 | ||
1179 | MODULE_AUTHOR("David Härdeman <david@hardeman.nu>"); | 1179 | MODULE_AUTHOR("David Härdeman <david@hardeman.nu>"); |
1180 | MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver"); | 1180 | MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver"); |
1181 | MODULE_LICENSE("GPL"); | 1181 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index d4d05d2ace65..f6d26419445e 100644 --- a/drivers/media/video/zoran/zoran_driver.c +++ b/drivers/media/video/zoran/zoran_driver.c | |||
@@ -1550,7 +1550,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag) | |||
1550 | if (zoran_formats[i].flags & flag && num++ == fmt->index) { | 1550 | if (zoran_formats[i].flags & flag && num++ == fmt->index) { |
1551 | strncpy(fmt->description, zoran_formats[i].name, | 1551 | strncpy(fmt->description, zoran_formats[i].name, |
1552 | sizeof(fmt->description) - 1); | 1552 | sizeof(fmt->description) - 1); |
1553 | /* fmt struct pre-zeroed, so adding '\0' not neeed */ | 1553 | /* fmt struct pre-zeroed, so adding '\0' not needed */ |
1554 | fmt->pixelformat = zoran_formats[i].fourcc; | 1554 | fmt->pixelformat = zoran_formats[i].fourcc; |
1555 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) | 1555 | if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED) |
1556 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | 1556 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; |
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h index fd6222882a0e..19fb21b8f0ce 100644 --- a/drivers/message/fusion/lsi/mpi_ioc.h +++ b/drivers/message/fusion/lsi/mpi_ioc.h | |||
@@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY | |||
857 | #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) | 857 | #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK (0xFFFF0000) |
858 | #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) | 858 | #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT (16) |
859 | 859 | ||
860 | /* SAS Discovery Errror Event data */ | 860 | /* SAS Discovery Error Event data */ |
861 | 861 | ||
862 | typedef struct _EVENT_DATA_DISCOVERY_ERROR | 862 | typedef struct _EVENT_DATA_DISCOVERY_ERROR |
863 | { | 863 | { |
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c index 5c766b4fb238..7d56f45dee19 100644 --- a/drivers/misc/ibmasm/command.c +++ b/drivers/misc/ibmasm/command.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
diff --git a/drivers/misc/ibmasm/dot_command.c b/drivers/misc/ibmasm/dot_command.c index 3dd2dfb8da17..d7b2ca358b23 100644 --- a/drivers/misc/ibmasm/dot_command.c +++ b/drivers/misc/ibmasm/dot_command.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/dot_command.h b/drivers/misc/ibmasm/dot_command.h index 6cbba1afef35..fc9fc9d4e087 100644 --- a/drivers/misc/ibmasm/dot_command.h +++ b/drivers/misc/ibmasm/dot_command.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c index 76bfda1ffaa9..8e540f4e9d52 100644 --- a/drivers/misc/ibmasm/event.c +++ b/drivers/misc/ibmasm/event.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c index 1bc4306572a4..90746378f9b7 100644 --- a/drivers/misc/ibmasm/heartbeat.c +++ b/drivers/misc/ibmasm/heartbeat.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
diff --git a/drivers/misc/ibmasm/i2o.h b/drivers/misc/ibmasm/i2o.h index bf2c738d2b72..2e9566dab2b1 100644 --- a/drivers/misc/ibmasm/i2o.h +++ b/drivers/misc/ibmasm/i2o.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 4d8a4e248b34..9b083448814d 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index 89947723a27d..35361753b487 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c index 4b2398e27fd5..5319ea261c05 100644 --- a/drivers/misc/ibmasm/lowlevel.c +++ b/drivers/misc/ibmasm/lowlevel.c | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/lowlevel.h b/drivers/misc/ibmasm/lowlevel.h index 766766523a60..e97848f51b3f 100644 --- a/drivers/misc/ibmasm/lowlevel.h +++ b/drivers/misc/ibmasm/lowlevel.h | |||
@@ -17,7 +17,7 @@ | |||
17 | * | 17 | * |
18 | * Copyright (C) IBM Corporation, 2004 | 18 | * Copyright (C) IBM Corporation, 2004 |
19 | * | 19 | * |
20 | * Author: Max Asböck <amax@us.ibm.com> | 20 | * Author: Max Asböck <amax@us.ibm.com> |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index a234d965243b..1ccedb71e728 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | * This driver is based on code originally written by Pete Reynolds | 23 | * This driver is based on code originally written by Pete Reynolds |
24 | * and others. | 24 | * and others. |
diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c index 2de487ac788c..232034f5da48 100644 --- a/drivers/misc/ibmasm/r_heartbeat.c +++ b/drivers/misc/ibmasm/r_heartbeat.c | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | * Copyright (C) IBM Corporation, 2004 | 17 | * Copyright (C) IBM Corporation, 2004 |
18 | * | 18 | * |
19 | * Author: Max Asböck <amax@us.ibm.com> | 19 | * Author: Max Asböck <amax@us.ibm.com> |
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h index 00dbf1d4373a..a7729ef76acb 100644 --- a/drivers/misc/ibmasm/remote.h +++ b/drivers/misc/ibmasm/remote.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | * Originally written by Pete Reynolds | 23 | * Originally written by Pete Reynolds |
24 | */ | 24 | */ |
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c index 93baa350d698..1dcb9ae1905a 100644 --- a/drivers/misc/ibmasm/uart.c +++ b/drivers/misc/ibmasm/uart.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * Copyright (C) IBM Corporation, 2004 | 19 | * Copyright (C) IBM Corporation, 2004 |
20 | * | 20 | * |
21 | * Author: Max Asböck <amax@us.ibm.com> | 21 | * Author: Max Asböck <amax@us.ibm.com> |
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 2dba999caf2c..887c0e598cf3 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/drivers/mmc/host/omap.c | 2 | * linux/drivers/mmc/host/omap.c |
3 | * | 3 | * |
4 | * Copyright (C) 2004 Nokia Corporation | 4 | * Copyright (C) 2004 Nokia Corporation |
5 | * Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com> | 5 | * Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com> |
6 | * Misc hacks here and there by Tony Lindgren <tony@atomide.com> | 6 | * Misc hacks here and there by Tony Lindgren <tony@atomide.com> |
7 | * Other hacks (DMA, SD, etc) by David Brownell | 7 | * Other hacks (DMA, SD, etc) by David Brownell |
8 | * | 8 | * |
@@ -1634,4 +1634,4 @@ module_exit(mmc_omap_exit); | |||
1634 | MODULE_DESCRIPTION("OMAP Multimedia Card driver"); | 1634 | MODULE_DESCRIPTION("OMAP Multimedia Card driver"); |
1635 | MODULE_LICENSE("GPL"); | 1635 | MODULE_LICENSE("GPL"); |
1636 | MODULE_ALIAS("platform:" DRIVER_NAME); | 1636 | MODULE_ALIAS("platform:" DRIVER_NAME); |
1637 | MODULE_AUTHOR("Juha Yrjölä"); | 1637 | MODULE_AUTHOR("Juha Yrjölä"); |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index cce7b70824c3..dd0279249bf4 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -420,7 +420,6 @@ config MTD_NAND_NANDSIM | |||
420 | config MTD_NAND_GPMI_NAND | 420 | config MTD_NAND_GPMI_NAND |
421 | bool "GPMI NAND Flash Controller driver" | 421 | bool "GPMI NAND Flash Controller driver" |
422 | depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28) | 422 | depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28) |
423 | select MTD_PARTITIONS | ||
424 | select MTD_CMDLINE_PARTS | 423 | select MTD_CMDLINE_PARTS |
425 | help | 424 | help |
426 | Enables NAND Flash support for IMX23 or IMX28. | 425 | Enables NAND Flash support for IMX23 or IMX28. |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index c381db23e713..0bd585bba39d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |||
@@ -683,7 +683,7 @@ out: | |||
683 | /* | 683 | /* |
684 | * Update our accounting state to incorporate the new Free List | 684 | * Update our accounting state to incorporate the new Free List |
685 | * buffers, tell the hardware about them and return the number of | 685 | * buffers, tell the hardware about them and return the number of |
686 | * bufers which we were able to allocate. | 686 | * buffers which we were able to allocate. |
687 | */ | 687 | */ |
688 | cred = fl->avail - cred; | 688 | cred = fl->avail - cred; |
689 | fl->pend_cred += cred; | 689 | fl->pend_cred += cred; |
diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h index 150511a922ef..1341f33e6084 100644 --- a/drivers/net/ethernet/sis/sis900.h +++ b/drivers/net/ethernet/sis/sis900.h | |||
@@ -205,7 +205,7 @@ enum sis900_tx_buffer_status { | |||
205 | EXCCOLL = 0x00100000, COLCNT = 0x000F0000 | 205 | EXCCOLL = 0x00100000, COLCNT = 0x000F0000 |
206 | }; | 206 | }; |
207 | 207 | ||
208 | enum sis900_rx_bufer_status { | 208 | enum sis900_rx_buffer_status { |
209 | OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, | 209 | OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, |
210 | MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, | 210 | MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, |
211 | RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, | 211 | RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index b56636da6cc3..2a4f2f153244 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self) | |||
1664 | switch_bank(iobase, BANK0); | 1664 | switch_bank(iobase, BANK0); |
1665 | outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR); | 1665 | outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR); |
1666 | 1666 | ||
1667 | /* Check for underrrun! */ | 1667 | /* Check for underrun! */ |
1668 | if (inb(iobase+ASCR) & ASCR_TXUR) { | 1668 | if (inb(iobase+ASCR) & ASCR_TXUR) { |
1669 | self->netdev->stats.tx_errors++; | 1669 | self->netdev->stats.tx_errors++; |
1670 | self->netdev->stats.tx_fifo_errors++; | 1670 | self->netdev->stats.tx_fifo_errors++; |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 6d6479049aa1..2d456dd164fb 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self) | |||
942 | iobase = self->io.fir_base; | 942 | iobase = self->io.fir_base; |
943 | /* Disable DMA */ | 943 | /* Disable DMA */ |
944 | // DisableDmaChannel(self->io.dma); | 944 | // DisableDmaChannel(self->io.dma); |
945 | /* Check for underrrun! */ | 945 | /* Check for underrun! */ |
946 | /* Clear bit, by writing 1 into it */ | 946 | /* Clear bit, by writing 1 into it */ |
947 | Tx_status = GetTXStatus(iobase); | 947 | Tx_status = GetTXStatus(iobase); |
948 | if (Tx_status & 0x08) { | 948 | if (Tx_status & 0x08) { |
949 | self->netdev->stats.tx_errors++; | 949 | self->netdev->stats.tx_errors++; |
950 | self->netdev->stats.tx_fifo_errors++; | 950 | self->netdev->stats.tx_fifo_errors++; |
951 | hwreset(self); | 951 | hwreset(self); |
952 | // how to clear underrrun ? | 952 | /* how to clear underrun? */ |
953 | } else { | 953 | } else { |
954 | self->netdev->stats.tx_packets++; | 954 | self->netdev->stats.tx_packets++; |
955 | ResetChip(iobase, 3); | 955 | ResetChip(iobase, 3); |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index c4366601b067..7d43506c7032 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -677,7 +677,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self) | |||
677 | switch_bank(iobase, SET0); | 677 | switch_bank(iobase, SET0); |
678 | outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); | 678 | outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR); |
679 | 679 | ||
680 | /* Check for underrrun! */ | 680 | /* Check for underrun! */ |
681 | if (inb(iobase+AUDR) & AUDR_UNDR) { | 681 | if (inb(iobase+AUDR) & AUDR_UNDR) { |
682 | IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); | 682 | IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ ); |
683 | 683 | ||
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index c421a6141854..c806d4550212 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -75,7 +75,7 @@ | |||
75 | * device is up and running or shutdown (through ifconfig up / | 75 | * device is up and running or shutdown (through ifconfig up / |
76 | * down). Bus-generic only. | 76 | * down). Bus-generic only. |
77 | * | 77 | * |
78 | * - control ops: control.c - implements various commmands for | 78 | * - control ops: control.c - implements various commands for |
79 | * controlling the device. bus-generic only. | 79 | * controlling the device. bus-generic only. |
80 | * | 80 | * |
81 | * - device model glue: driver.c - implements helpers for the | 81 | * - device model glue: driver.c - implements helpers for the |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c index f5bd3a3cd34a..9d89d7ccdafb 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c | |||
@@ -466,8 +466,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) | |||
466 | bool int_migration = *(bool *) (val); | 466 | bool int_migration = *(bool *) (val); |
467 | 467 | ||
468 | if (int_migration) { | 468 | if (int_migration) { |
469 | /* Set interrrupt migration timer and | 469 | /* Set interrupt migration timer and |
470 | * corresponging Tx/Rx counter. | 470 | * corresponding Tx/Rx counter. |
471 | * timer 25ns*0xfa0=100us for 0xf packets. | 471 | * timer 25ns*0xfa0=100us for 0xf packets. |
472 | * 0x306:Rx, 0x307:Tx */ | 472 | * 0x306:Rx, 0x307:Tx */ |
473 | rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0); | 473 | rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0); |
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig index 553a9905299a..620264936341 100644 --- a/drivers/parisc/Kconfig +++ b/drivers/parisc/Kconfig | |||
@@ -108,13 +108,6 @@ config IOMMU_HELPER | |||
108 | depends on IOMMU_SBA || IOMMU_CCIO | 108 | depends on IOMMU_SBA || IOMMU_CCIO |
109 | default y | 109 | default y |
110 | 110 | ||
111 | #config PCI_EPIC | ||
112 | # bool "EPIC/SAGA PCI support" | ||
113 | # depends on PCI | ||
114 | # default y | ||
115 | # help | ||
116 | # Say Y here for V-class PCI, DMA/IOMMU, IRQ subsystem support. | ||
117 | |||
118 | source "drivers/pcmcia/Kconfig" | 111 | source "drivers/pcmcia/Kconfig" |
119 | 112 | ||
120 | source "drivers/pci/hotplug/Kconfig" | 113 | source "drivers/pci/hotplug/Kconfig" |
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c index 362db31d8ca6..1c0c642b3e23 100644 --- a/drivers/parport/parport_mfc3.c +++ b/drivers/parport/parport_mfc3.c | |||
@@ -397,7 +397,7 @@ static void __exit parport_mfc3_exit(void) | |||
397 | 397 | ||
398 | 398 | ||
399 | MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>"); | 399 | MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>"); |
400 | MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port"); | 400 | MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Parallel Port"); |
401 | MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port"); | 401 | MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port"); |
402 | MODULE_LICENSE("GPL"); | 402 | MODULE_LICENSE("GPL"); |
403 | 403 | ||
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c index e4a778720301..2e3117aa382f 100644 --- a/drivers/scsi/aic7xxx/aicasm/aicasm.c +++ b/drivers/scsi/aic7xxx/aicasm/aicasm.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Aic7xxx SCSI host adapter firmware asssembler | 2 | * Aic7xxx SCSI host adapter firmware assembler |
3 | * | 3 | * |
4 | * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs. | 4 | * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs. |
5 | * Copyright (c) 2001, 2002 Adaptec Inc. | 5 | * Copyright (c) 2001, 2002 Adaptec Inc. |
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index d969855ac64a..d3e4d7c6f577 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h | |||
@@ -359,7 +359,7 @@ typedef struct { | |||
359 | u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */ | 359 | u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */ |
360 | u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */ | 360 | u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */ |
361 | u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */ | 361 | u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */ |
362 | u32 cmd_buff_size; /* size of each cmd bufer in bytes */ | 362 | u32 cmd_buff_size; /* size of each cmd buffer in bytes */ |
363 | u32 reserved1; | 363 | u32 reserved1; |
364 | u32 reserved2; | 364 | u32 reserved2; |
365 | } __attribute__((packed)) gdth_perf_modes; | 365 | } __attribute__((packed)) gdth_perf_modes; |
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 218f71a8726e..d77891e5683b 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -4494,7 +4494,7 @@ ips_init_scb(ips_ha_t * ha, ips_scb_t * scb) | |||
4494 | /* */ | 4494 | /* */ |
4495 | /* Initialize a CCB to default values */ | 4495 | /* Initialize a CCB to default values */ |
4496 | /* */ | 4496 | /* */ |
4497 | /* ASSUMED to be callled from within a lock */ | 4497 | /* ASSUMED to be called from within a lock */ |
4498 | /* */ | 4498 | /* */ |
4499 | /****************************************************************************/ | 4499 | /****************************************************************************/ |
4500 | static ips_scb_t * | 4500 | static ips_scb_t * |
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index 08e26d4e3731..27cfb0cb186c 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* jazz_esp.c: ESP front-end for MIPS JAZZ systems. | 1 | /* jazz_esp.c: ESP front-end for MIPS JAZZ systems. |
2 | * | 2 | * |
3 | * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende) | 3 | * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende) |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 5163edb925cb..ea8a0b47d66d 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -4105,7 +4105,7 @@ static long pmcraid_chr_ioctl( | |||
4105 | hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL); | 4105 | hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL); |
4106 | 4106 | ||
4107 | if (!hdr) { | 4107 | if (!hdr) { |
4108 | pmcraid_err("faile to allocate memory for ioctl header\n"); | 4108 | pmcraid_err("failed to allocate memory for ioctl header\n"); |
4109 | return -ENOMEM; | 4109 | return -ENOMEM; |
4110 | } | 4110 | } |
4111 | 4111 | ||
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 03554934b0a5..1873940a7ccb 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -1055,7 +1055,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha) | |||
1055 | "ROM lock failed.\n"); | 1055 | "ROM lock failed.\n"); |
1056 | return -1; | 1056 | return -1; |
1057 | } | 1057 | } |
1058 | return 0;; | 1058 | return 0; |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | static int | 1061 | static int |
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h index 4ac07f882521..7825c141bc1a 100644 --- a/drivers/scsi/qla4xxx/ql4_fw.h +++ b/drivers/scsi/qla4xxx/ql4_fw.h | |||
@@ -752,7 +752,7 @@ struct dev_db_entry { | |||
752 | uint8_t res4[0x36]; /* 8A-BF */ | 752 | uint8_t res4[0x36]; /* 8A-BF */ |
753 | uint8_t iscsi_name[0xE0]; /* C0-19F : xxzzy Make this a | 753 | uint8_t iscsi_name[0xE0]; /* C0-19F : xxzzy Make this a |
754 | * pointer to a string so we | 754 | * pointer to a string so we |
755 | * don't have to reserve soooo | 755 | * don't have to reserve so |
756 | * much RAM */ | 756 | * much RAM */ |
757 | uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */ | 757 | uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */ |
758 | uint8_t res5[0x10]; /* 1B0-1BF */ | 758 | uint8_t res5[0x10]; /* 1B0-1BF */ |
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c index 9acc2b2a3601..cf51432f8e72 100644 --- a/drivers/scsi/sni_53c710.c +++ b/drivers/scsi/sni_53c710.c | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | #include "53c700.h" | 52 | #include "53c700.h" |
53 | 53 | ||
54 | MODULE_AUTHOR("Thomas Bogendörfer"); | 54 | MODULE_AUTHOR("Thomas Bogendörfer"); |
55 | MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver"); | 55 | MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver"); |
56 | MODULE_LICENSE("GPL"); | 56 | MODULE_LICENSE("GPL"); |
57 | MODULE_ALIAS("platform:snirm_53c710"); | 57 | MODULE_ALIAS("platform:snirm_53c710"); |
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index a18996d24466..7264116185d5 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c | |||
@@ -1144,7 +1144,7 @@ static void pvscsi_release_resources(struct pvscsi_adapter *adapter) | |||
1144 | * | 1144 | * |
1145 | * These are statically allocated. Trying to be clever was not worth it. | 1145 | * These are statically allocated. Trying to be clever was not worth it. |
1146 | * | 1146 | * |
1147 | * Dynamic allocation can fail, and we can't go deeep into the memory | 1147 | * Dynamic allocation can fail, and we can't go deep into the memory |
1148 | * allocator, since we're a SCSI driver, and trying too hard to allocate | 1148 | * allocator, since we're a SCSI driver, and trying too hard to allocate |
1149 | * memory might generate disk I/O. We also don't want to fail disk I/O | 1149 | * memory might generate disk I/O. We also don't want to fail disk I/O |
1150 | * in that case because we can't get an allocation - the I/O could be | 1150 | * in that case because we can't get an allocation - the I/O could be |
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 7587796224c8..56abf55e49da 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -174,8 +174,7 @@ config SPI_LM70_LLP | |||
174 | 174 | ||
175 | config SPI_MPC52xx | 175 | config SPI_MPC52xx |
176 | tristate "Freescale MPC52xx SPI (non-PSC) controller support" | 176 | tristate "Freescale MPC52xx SPI (non-PSC) controller support" |
177 | depends on PPC_MPC52xx && SPI | 177 | depends on PPC_MPC52xx |
178 | select SPI_MASTER_OF | ||
179 | help | 178 | help |
180 | This drivers supports the MPC52xx SPI controller in master SPI | 179 | This drivers supports the MPC52xx SPI controller in master SPI |
181 | mode. | 180 | mode. |
diff --git a/drivers/staging/bcm/target_params.h b/drivers/staging/bcm/target_params.h index 2d8b8a367b38..14876388b879 100644 --- a/drivers/staging/bcm/target_params.h +++ b/drivers/staging/bcm/target_params.h | |||
@@ -72,8 +72,8 @@ typedef struct _TARGET_PARAMS | |||
72 | // removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files.. | 72 | // removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files.. |
73 | 73 | ||
74 | //BAMC Related Parameters | 74 | //BAMC Related Parameters |
75 | //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling. | 75 | //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 – Enable Band AMC signaling. |
76 | //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support. | 76 | //bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support. |
77 | B_UINT32 m_u32BandAMCEnable; | 77 | B_UINT32 m_u32BandAMCEnable; |
78 | 78 | ||
79 | } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS; | 79 | } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS; |
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index c75a1a1fd775..f9545b064eaf 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c | |||
@@ -3598,7 +3598,7 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device *dev) | |||
3598 | n = comedi_buf_write_alloc(s->async, | 3598 | n = comedi_buf_write_alloc(s->async, |
3599 | (7 + 12) * sizeof(unsigned int)); | 3599 | (7 + 12) * sizeof(unsigned int)); |
3600 | 3600 | ||
3601 | /* If not enougth memory available, event is set to Comedi Buffer Errror */ | 3601 | /* If not enough memory available, event is set to Comedi Buffer Error */ |
3602 | if (n > ((7 + 12) * sizeof(unsigned int))) { | 3602 | if (n > ((7 + 12) * sizeof(unsigned int))) { |
3603 | printk("\ncomedi_buf_write_alloc n = %i", n); | 3603 | printk("\ncomedi_buf_write_alloc n = %i", n); |
3604 | s->async->events |= COMEDI_CB_ERROR; | 3604 | s->async->events |= COMEDI_CB_ERROR; |
diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h index 5c99646cd103..ae8f06d05bed 100644 --- a/drivers/staging/cxt1e1/libsbew.h +++ b/drivers/staging/cxt1e1/libsbew.h | |||
@@ -323,7 +323,7 @@ struct sbecom_port_param | |||
323 | #define CFG_CH_DINV_TX 0x02 | 323 | #define CFG_CH_DINV_TX 0x02 |
324 | 324 | ||
325 | 325 | ||
326 | /* Posssible resettable chipsets/functions */ | 326 | /* Possible resettable chipsets/functions */ |
327 | #define RESET_DEV_TEMUX 1 | 327 | #define RESET_DEV_TEMUX 1 |
328 | #define RESET_DEV_TECT3 RESET_DEV_TEMUX | 328 | #define RESET_DEV_TECT3 RESET_DEV_TEMUX |
329 | #define RESET_DEV_PLL 2 | 329 | #define RESET_DEV_PLL 2 |
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index b3d743a3d308..917bbb082a6e 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | |||
@@ -344,10 +344,10 @@ static void ft1000_reset_asic(struct net_device *dev) | |||
344 | } | 344 | } |
345 | mdelay(1); | 345 | mdelay(1); |
346 | if (info->AsicID == ELECTRABUZZ_ID) { | 346 | if (info->AsicID == ELECTRABUZZ_ID) { |
347 | // set watermark to -1 in order to not generate an interrrupt | 347 | // set watermark to -1 in order to not generate an interrupt |
348 | ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0xffff); | 348 | ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0xffff); |
349 | } else { | 349 | } else { |
350 | // set watermark to -1 in order to not generate an interrrupt | 350 | // set watermark to -1 in order to not generate an interrupt |
351 | ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0xffff); | 351 | ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0xffff); |
352 | } | 352 | } |
353 | // clear interrupts | 353 | // clear interrupts |
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index aaf44c359827..43b1d363107e 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |||
@@ -601,7 +601,7 @@ static void ft1000_reset_asic(struct net_device *dev) | |||
601 | 601 | ||
602 | mdelay(1); | 602 | mdelay(1); |
603 | 603 | ||
604 | /* set watermark to -1 in order to not generate an interrrupt */ | 604 | /* set watermark to -1 in order to not generate an interrupt */ |
605 | ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK); | 605 | ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK); |
606 | 606 | ||
607 | /* clear interrupts */ | 607 | /* clear interrupts */ |
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c index 2c626e0cb29c..68a4d4e8c635 100644 --- a/drivers/staging/iio/industrialio-trigger.c +++ b/drivers/staging/iio/industrialio-trigger.c | |||
@@ -295,7 +295,7 @@ void iio_dealloc_pollfunc(struct iio_poll_func *pf) | |||
295 | EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc); | 295 | EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc); |
296 | 296 | ||
297 | /** | 297 | /** |
298 | * iio_trigger_read_currrent() - trigger consumer sysfs query which trigger | 298 | * iio_trigger_read_current() - trigger consumer sysfs query which trigger |
299 | * | 299 | * |
300 | * For trigger consumers the current_trigger interface allows the trigger | 300 | * For trigger consumers the current_trigger interface allows the trigger |
301 | * used by the device to be queried. | 301 | * used by the device to be queried. |
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c index 31f7813cab0d..cc49038e55d6 100644 --- a/drivers/staging/keucr/smilmain.c +++ b/drivers/staging/keucr/smilmain.c | |||
@@ -148,7 +148,7 @@ int Media_D_ReadSector(struct us_data *us, DWORD start,WORD count,BYTE *buf) | |||
148 | { | 148 | { |
149 | WORD len, bn; | 149 | WORD len, bn; |
150 | 150 | ||
151 | //if (Check_D_MediaPower()) ; ¦b 6250 don't care | 151 | //if (Check_D_MediaPower()) ; ¦b 6250 don't care |
152 | // return(ErrCode); | 152 | // return(ErrCode); |
153 | //if (Check_D_MediaFmt(fdoExt)) ; | 153 | //if (Check_D_MediaFmt(fdoExt)) ; |
154 | // return(ErrCode); | 154 | // return(ErrCode); |
@@ -594,7 +594,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt) | |||
594 | // if (Check_D_CardStsChg()) | 594 | // if (Check_D_CardStsChg()) |
595 | // MediaChange = ERROR; | 595 | // MediaChange = ERROR; |
596 | // //usleep(56*1024); | 596 | // //usleep(56*1024); |
597 | // if ((!Check_D_CntPower())&&(!MediaChange)) // ¦³ power & Media ¨S³Q change, «h return success | 597 | // if ((!Check_D_CntPower())&&(!MediaChange)) // ¦³ power & Media ¨S³Q change, «h return success |
598 | // return(SMSUCCESS); | 598 | // return(SMSUCCESS); |
599 | // //usleep(56*1024); | 599 | // //usleep(56*1024); |
600 | // | 600 | // |
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c index 8ac3faea2d2f..f47571ea745d 100644 --- a/drivers/staging/sep/sep_driver.c +++ b/drivers/staging/sep/sep_driver.c | |||
@@ -1235,7 +1235,7 @@ static void sep_build_lli_table(struct sep_device *sep, | |||
1235 | /* Counter of lli array entry */ | 1235 | /* Counter of lli array entry */ |
1236 | u32 array_counter; | 1236 | u32 array_counter; |
1237 | 1237 | ||
1238 | /* Init currrent table data size and lli array entry counter */ | 1238 | /* Init current table data size and lli array entry counter */ |
1239 | curr_table_data_size = 0; | 1239 | curr_table_data_size = 0; |
1240 | array_counter = 0; | 1240 | array_counter = 0; |
1241 | *num_table_entries_ptr = 1; | 1241 | *num_table_entries_ptr = 1; |
diff --git a/drivers/staging/tidspbridge/Kconfig b/drivers/staging/tidspbridge/Kconfig index 93de4f2e8bf8..21a559ecbbb1 100644 --- a/drivers/staging/tidspbridge/Kconfig +++ b/drivers/staging/tidspbridge/Kconfig | |||
@@ -78,7 +78,7 @@ config TIDSPBRIDGE_NTFY_PWRERR | |||
78 | bool "Notify power errors" | 78 | bool "Notify power errors" |
79 | depends on TIDSPBRIDGE | 79 | depends on TIDSPBRIDGE |
80 | help | 80 | help |
81 | Enable notifications to registered clients on the event of power errror | 81 | Enable notifications to registered clients on the event of power error |
82 | trying to suspend bridge driver. Say Y, to signal this event as a fatal | 82 | trying to suspend bridge driver. Say Y, to signal this event as a fatal |
83 | error, this will require a bridge restart to recover. | 83 | error, this will require a bridge restart to recover. |
84 | 84 | ||
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c index a7e407e25187..fda240214cd6 100644 --- a/drivers/staging/tidspbridge/rmgr/dbdcd.c +++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c | |||
@@ -285,7 +285,7 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type, | |||
285 | enum_refs = 0; | 285 | enum_refs = 0; |
286 | 286 | ||
287 | /* | 287 | /* |
288 | * TODO: Revisit, this is not an errror case but code | 288 | * TODO: Revisit, this is not an error case but code |
289 | * expects non-zero value. | 289 | * expects non-zero value. |
290 | */ | 290 | */ |
291 | status = ENODATA; | 291 | status = ENODATA; |
diff --git a/drivers/staging/wlags49_h2/debug.h b/drivers/staging/wlags49_h2/debug.h index 8d5dddf08055..811698f1070c 100644 --- a/drivers/staging/wlags49_h2/debug.h +++ b/drivers/staging/wlags49_h2/debug.h | |||
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/dhfcfg.h b/drivers/staging/wlags49_h2/dhfcfg.h index 75c279f268ae..147f4c83c00c 100644 --- a/drivers/staging/wlags49_h2/dhfcfg.h +++ b/drivers/staging/wlags49_h2/dhfcfg.h | |||
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c index 7dc176a95aab..b008773323b3 100644 --- a/drivers/staging/wlags49_h2/hcf.c +++ b/drivers/staging/wlags49_h2/hcf.c | |||
@@ -32,9 +32,9 @@ | |||
32 | * software indicates your acceptance of these terms and conditions. If you do | 32 | * software indicates your acceptance of these terms and conditions. If you do |
33 | * not agree with these terms and conditions, do not use the software. | 33 | * not agree with these terms and conditions, do not use the software. |
34 | * | 34 | * |
35 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved | 35 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved |
36 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved | 36 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved |
37 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 37 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
38 | * All rights reserved. | 38 | * All rights reserved. |
39 | * | 39 | * |
40 | * Redistribution and use in source or binary forms, with or without | 40 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/hcf.h b/drivers/staging/wlags49_h2/hcf.h index 000994731166..95527b5cf863 100644 --- a/drivers/staging/wlags49_h2/hcf.h +++ b/drivers/staging/wlags49_h2/hcf.h | |||
@@ -40,9 +40,9 @@ | |||
40 | * software indicates your acceptance of these terms and conditions. If you do | 40 | * software indicates your acceptance of these terms and conditions. If you do |
41 | * not agree with these terms and conditions, do not use the software. | 41 | * not agree with these terms and conditions, do not use the software. |
42 | * | 42 | * |
43 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved | 43 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved |
44 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved | 44 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved |
45 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 45 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
46 | * All rights reserved. | 46 | * All rights reserved. |
47 | * | 47 | * |
48 | * Redistribution and use in source or binary forms, with or without | 48 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/hcfcfg.h b/drivers/staging/wlags49_h2/hcfcfg.h index 7545bc554112..ef60da8c3ebc 100644 --- a/drivers/staging/wlags49_h2/hcfcfg.h +++ b/drivers/staging/wlags49_h2/hcfcfg.h | |||
@@ -64,9 +64,9 @@ | |||
64 | * software indicates your acceptance of these terms and conditions. If you do | 64 | * software indicates your acceptance of these terms and conditions. If you do |
65 | * not agree with these terms and conditions, do not use the software. | 65 | * not agree with these terms and conditions, do not use the software. |
66 | * | 66 | * |
67 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved | 67 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved |
68 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved | 68 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved |
69 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 69 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
70 | * All rights reserved. | 70 | * All rights reserved. |
71 | * | 71 | * |
72 | * Redistribution and use in source or binary forms, with or without | 72 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h index a62b53a22891..30744e194a23 100644 --- a/drivers/staging/wlags49_h2/hcfdef.h +++ b/drivers/staging/wlags49_h2/hcfdef.h | |||
@@ -33,9 +33,9 @@ | |||
33 | * software indicates your acceptance of these terms and conditions. If you do | 33 | * software indicates your acceptance of these terms and conditions. If you do |
34 | * not agree with these terms and conditions, do not use the software. | 34 | * not agree with these terms and conditions, do not use the software. |
35 | * | 35 | * |
36 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved | 36 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved |
37 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved | 37 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved |
38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
39 | * All rights reserved. | 39 | * All rights reserved. |
40 | * | 40 | * |
41 | * Redistribution and use in source or binary forms, with or without | 41 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/mdd.h b/drivers/staging/wlags49_h2/mdd.h index b02e3ea9e479..5f951efb9c07 100644 --- a/drivers/staging/wlags49_h2/mdd.h +++ b/drivers/staging/wlags49_h2/mdd.h | |||
@@ -33,9 +33,9 @@ | |||
33 | * software indicates your acceptance of these terms and conditions. If you do | 33 | * software indicates your acceptance of these terms and conditions. If you do |
34 | * not agree with these terms and conditions, do not use the software. | 34 | * not agree with these terms and conditions, do not use the software. |
35 | * | 35 | * |
36 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved | 36 | * COPYRIGHT © 1994 - 1995 by AT&T. All Rights Reserved |
37 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved | 37 | * COPYRIGHT © 1996 - 2000 by Lucent Technologies. All Rights Reserved |
38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
39 | * All rights reserved. | 39 | * All rights reserved. |
40 | * | 40 | * |
41 | * Redistribution and use in source or binary forms, with or without | 41 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/mmd.c b/drivers/staging/wlags49_h2/mmd.c index de138c481a9e..c8f52107e6ca 100644 --- a/drivers/staging/wlags49_h2/mmd.c +++ b/drivers/staging/wlags49_h2/mmd.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * software indicates your acceptance of these terms and conditions. If you do | 35 | * software indicates your acceptance of these terms and conditions. If you do |
36 | * not agree with these terms and conditions, do not use the software. | 36 | * not agree with these terms and conditions, do not use the software. |
37 | * | 37 | * |
38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 38 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
39 | * All rights reserved. | 39 | * All rights reserved. |
40 | * | 40 | * |
41 | * Redistribution and use in source or binary forms, with or without | 41 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/mmd.h b/drivers/staging/wlags49_h2/mmd.h index 06890c1b30a4..914952513005 100644 --- a/drivers/staging/wlags49_h2/mmd.h +++ b/drivers/staging/wlags49_h2/mmd.h | |||
@@ -33,7 +33,7 @@ | |||
33 | * software indicates your acceptance of these terms and conditions. If you do | 33 | * software indicates your acceptance of these terms and conditions. If you do |
34 | * not agree with these terms and conditions, do not use the software. | 34 | * not agree with these terms and conditions, do not use the software. |
35 | * | 35 | * |
36 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved | 36 | * COPYRIGHT © 2001 - 2004 by Agere Systems Inc. All Rights Reserved |
37 | * All rights reserved. | 37 | * All rights reserved. |
38 | * | 38 | * |
39 | * Redistribution and use in source or binary forms, with or without | 39 | * Redistribution and use in source or binary forms, with or without |
diff --git a/drivers/staging/wlags49_h2/wl_cs.h b/drivers/staging/wlags49_h2/wl_cs.h index 21f17be4f02a..a7ab579759de 100644 --- a/drivers/staging/wlags49_h2/wl_cs.h +++ b/drivers/staging/wlags49_h2/wl_cs.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_enc.c b/drivers/staging/wlags49_h2/wl_enc.c index 26cf5486edd6..4c6f776cc4da 100644 --- a/drivers/staging/wlags49_h2/wl_enc.c +++ b/drivers/staging/wlags49_h2/wl_enc.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_enc.h b/drivers/staging/wlags49_h2/wl_enc.h index b4f54d81f311..46629f3b112b 100644 --- a/drivers/staging/wlags49_h2/wl_enc.h +++ b/drivers/staging/wlags49_h2/wl_enc.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_if.h b/drivers/staging/wlags49_h2/wl_if.h index ed2b4135a10e..6a26130f5a3a 100644 --- a/drivers/staging/wlags49_h2/wl_if.h +++ b/drivers/staging/wlags49_h2/wl_if.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h index 575340834051..553601f48873 100644 --- a/drivers/staging/wlags49_h2/wl_internal.h +++ b/drivers/staging/wlags49_h2/wl_internal.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index 483eee1bf63a..dab603e0f452 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_main.h b/drivers/staging/wlags49_h2/wl_main.h index d593ae535fb8..3b5acdf4e329 100644 --- a/drivers/staging/wlags49_h2/wl_main.h +++ b/drivers/staging/wlags49_h2/wl_main.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index 5a2b334f206e..9c16f5478a75 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_netdev.h b/drivers/staging/wlags49_h2/wl_netdev.h index 632ab2e6302c..61f040f26d97 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.h +++ b/drivers/staging/wlags49_h2/wl_netdev.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 28ae9dd1b44e..1f1d98679171 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_pci.h b/drivers/staging/wlags49_h2/wl_pci.h index cea04c44ec47..86831f1b4de2 100644 --- a/drivers/staging/wlags49_h2/wl_pci.h +++ b/drivers/staging/wlags49_h2/wl_pci.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c index 260d4f0d47b4..f30e5ee4bca3 100644 --- a/drivers/staging/wlags49_h2/wl_priv.c +++ b/drivers/staging/wlags49_h2/wl_priv.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_priv.h b/drivers/staging/wlags49_h2/wl_priv.h index 9b0254497aa7..b647bfd90098 100644 --- a/drivers/staging/wlags49_h2/wl_priv.h +++ b/drivers/staging/wlags49_h2/wl_priv.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c index a459e48c7bf0..b8c96cf18de5 100644 --- a/drivers/staging/wlags49_h2/wl_profile.c +++ b/drivers/staging/wlags49_h2/wl_profile.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_profile.h b/drivers/staging/wlags49_h2/wl_profile.h index 81db8e8c6ba8..f81df51d2216 100644 --- a/drivers/staging/wlags49_h2/wl_profile.h +++ b/drivers/staging/wlags49_h2/wl_profile.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c index 3b6f5a59b2bb..b748a3ff7954 100644 --- a/drivers/staging/wlags49_h2/wl_util.c +++ b/drivers/staging/wlags49_h2/wl_util.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h index 2661bcd6b0ec..946b1b64c46f 100644 --- a/drivers/staging/wlags49_h2/wl_util.h +++ b/drivers/staging/wlags49_h2/wl_util.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_version.h b/drivers/staging/wlags49_h2/wl_version.h index fd37040afd01..3deacfac9d25 100644 --- a/drivers/staging/wlags49_h2/wl_version.h +++ b/drivers/staging/wlags49_h2/wl_version.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * software indicates your acceptance of these terms and conditions. If you do | 23 | * software indicates your acceptance of these terms and conditions. If you do |
24 | * not agree with these terms and conditions, do not use the software. | 24 | * not agree with these terms and conditions, do not use the software. |
25 | * | 25 | * |
26 | * Copyright © 2003 Agere Systems Inc. | 26 | * Copyright © 2003 Agere Systems Inc. |
27 | * All rights reserved. | 27 | * All rights reserved. |
28 | * | 28 | * |
29 | * Redistribution and use in source or binary forms, with or without | 29 | * Redistribution and use in source or binary forms, with or without |
@@ -44,7 +44,7 @@ | |||
44 | * | 44 | * |
45 | * Disclaimer | 45 | * Disclaimer |
46 | * | 46 | * |
47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 47 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 48 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 49 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 50 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 8ac5e1081aa0..7ff0a108da13 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * software indicates your acceptance of these terms and conditions. If you do | 18 | * software indicates your acceptance of these terms and conditions. If you do |
19 | * not agree with these terms and conditions, do not use the software. | 19 | * not agree with these terms and conditions, do not use the software. |
20 | * | 20 | * |
21 | * Copyright © 2003 Agere Systems Inc. | 21 | * Copyright © 2003 Agere Systems Inc. |
22 | * All rights reserved. | 22 | * All rights reserved. |
23 | * | 23 | * |
24 | * Redistribution and use in source or binary forms, with or without | 24 | * Redistribution and use in source or binary forms, with or without |
@@ -39,7 +39,7 @@ | |||
39 | * | 39 | * |
40 | * Disclaimer | 40 | * Disclaimer |
41 | * | 41 | * |
42 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 42 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
43 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 43 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
44 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 44 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
45 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 45 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/staging/wlags49_h2/wl_wext.h b/drivers/staging/wlags49_h2/wl_wext.h index a713058c8027..029da52c4c49 100644 --- a/drivers/staging/wlags49_h2/wl_wext.h +++ b/drivers/staging/wlags49_h2/wl_wext.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * software indicates your acceptance of these terms and conditions. If you do | 22 | * software indicates your acceptance of these terms and conditions. If you do |
23 | * not agree with these terms and conditions, do not use the software. | 23 | * not agree with these terms and conditions, do not use the software. |
24 | * | 24 | * |
25 | * Copyright © 2003 Agere Systems Inc. | 25 | * Copyright © 2003 Agere Systems Inc. |
26 | * All rights reserved. | 26 | * All rights reserved. |
27 | * | 27 | * |
28 | * Redistribution and use in source or binary forms, with or without | 28 | * Redistribution and use in source or binary forms, with or without |
@@ -43,7 +43,7 @@ | |||
43 | * | 43 | * |
44 | * Disclaimer | 44 | * Disclaimer |
45 | * | 45 | * |
46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, | 46 | * THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, |
47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF | 47 | * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF |
48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY | 48 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY |
49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN | 49 | * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN |
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 925a1e547a83..95b21a619900 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
@@ -808,7 +808,7 @@ config BFIN_UART3_CTSRTS | |||
808 | 808 | ||
809 | config SERIAL_IMX | 809 | config SERIAL_IMX |
810 | bool "IMX serial port support" | 810 | bool "IMX serial port support" |
811 | depends on ARM && (ARCH_IMX || ARCH_MXC) | 811 | depends on ARCH_MXC |
812 | select SERIAL_CORE | 812 | select SERIAL_CORE |
813 | select RATIONAL | 813 | select RATIONAL |
814 | help | 814 | help |
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 23a447373c51..12a401a144b7 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -264,7 +264,6 @@ config USB_PXA27X | |||
264 | config USB_S3C_HSOTG | 264 | config USB_S3C_HSOTG |
265 | tristate "S3C HS/OtG USB Device controller" | 265 | tristate "S3C HS/OtG USB Device controller" |
266 | depends on S3C_DEV_USB_HSOTG | 266 | depends on S3C_DEV_USB_HSOTG |
267 | select USB_GADGET_S3C_HSOTG_PIO | ||
268 | select USB_GADGET_DUALSPEED | 267 | select USB_GADGET_DUALSPEED |
269 | help | 268 | help |
270 | The Samsung S3C64XX USB2.0 high-speed gadget controller | 269 | The Samsung S3C64XX USB2.0 high-speed gadget controller |
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index b8643771fa80..fac4c650d4bb 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Samsung S3C24xx series on-chip full speed USB device controllers | 4 | * Samsung S3C24xx series on-chip full speed USB device controllers |
5 | * | 5 | * |
6 | * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard | 6 | * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard |
7 | * Additional cleanups by Ben Dooks <ben-linux@fluff.org> | 7 | * Additional cleanups by Ben Dooks <ben-linux@fluff.org> |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | #define DRIVER_DESC "S3C2410 USB Device Controller Gadget" | 52 | #define DRIVER_DESC "S3C2410 USB Device Controller Gadget" |
53 | #define DRIVER_VERSION "29 Apr 2007" | 53 | #define DRIVER_VERSION "29 Apr 2007" |
54 | #define DRIVER_AUTHOR "Herbert Pötzl <herbert@13thfloor.at>, " \ | 54 | #define DRIVER_AUTHOR "Herbert Pötzl <herbert@13thfloor.at>, " \ |
55 | "Arnaud Patard <arnaud.patard@rtp-net.org>" | 55 | "Arnaud Patard <arnaud.patard@rtp-net.org>" |
56 | 56 | ||
57 | static const char gadget_name[] = "s3c2410_udc"; | 57 | static const char gadget_name[] = "s3c2410_udc"; |
diff --git a/drivers/usb/gadget/s3c2410_udc.h b/drivers/usb/gadget/s3c2410_udc.h index a48f619cb1cc..1653bae08b80 100644 --- a/drivers/usb/gadget/s3c2410_udc.h +++ b/drivers/usb/gadget/s3c2410_udc.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/drivers/usb/gadget/s3c2410_udc.h | 2 | * linux/drivers/usb/gadget/s3c2410_udc.h |
3 | * Samsung on-chip full speed USB device controllers | 3 | * Samsung on-chip full speed USB device controllers |
4 | * | 4 | * |
5 | * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard | 5 | * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard |
6 | * Additional cleanups by Ben Dooks <ben-linux@fluff.org> | 6 | * Additional cleanups by Ben Dooks <ben-linux@fluff.org> |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c index 056fb2d37c88..43b3ca48d753 100644 --- a/drivers/usb/host/hwa-hc.c +++ b/drivers/usb/host/hwa-hc.c | |||
@@ -481,7 +481,7 @@ static int __hwahc_op_set_ptk(struct wusbhc *wusbhc, u8 port_idx, u32 tkid, | |||
481 | encryption_value = 0; | 481 | encryption_value = 0; |
482 | } | 482 | } |
483 | 483 | ||
484 | /* Set the encryption type for commmunicating with the device */ | 484 | /* Set the encryption type for communicating with the device */ |
485 | result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0), | 485 | result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0), |
486 | USB_REQ_SET_ENCRYPTION, | 486 | USB_REQ_SET_ENCRYPTION, |
487 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, | 487 | USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, |
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index 2ee18cfa1efe..dbf0f156ed9e 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
@@ -473,7 +473,7 @@ static void free_epdmem(struct imx21 *imx21, struct usb_host_endpoint *ep) | |||
473 | /* End handling */ | 473 | /* End handling */ |
474 | /* =========================================== */ | 474 | /* =========================================== */ |
475 | 475 | ||
476 | /* Endpoint now idle - release it's ETD(s) or asssign to queued request */ | 476 | /* Endpoint now idle - release its ETD(s) or assign to queued request */ |
477 | static void ep_idle(struct imx21 *imx21, struct ep_priv *ep_priv) | 477 | static void ep_idle(struct imx21 *imx21, struct ep_priv *ep_priv) |
478 | { | 478 | { |
479 | int i; | 479 | int i; |
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 318fb4e8a885..53be7aef6308 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
@@ -513,7 +513,7 @@ static inline int cppi_autoreq_update(struct cppi_channel *rx, | |||
513 | if (!(val & MUSB_RXCSR_H_REQPKT)) { | 513 | if (!(val & MUSB_RXCSR_H_REQPKT)) { |
514 | val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; | 514 | val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; |
515 | musb_writew(regs, MUSB_RXCSR, val); | 515 | musb_writew(regs, MUSB_RXCSR, val); |
516 | /* flush writebufer */ | 516 | /* flush writebuffer */ |
517 | val = musb_readw(regs, MUSB_RXCSR); | 517 | val = musb_readw(regs, MUSB_RXCSR); |
518 | } | 518 | } |
519 | } | 519 | } |
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c index 0f420b25e9a9..2d9cc445fc73 100644 --- a/drivers/usb/otg/fsl_otg.c +++ b/drivers/usb/otg/fsl_otg.c | |||
@@ -639,7 +639,7 @@ static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA) | |||
639 | * Delayed pin detect interrupt processing. | 639 | * Delayed pin detect interrupt processing. |
640 | * | 640 | * |
641 | * When the Mini-A cable is disconnected from the board, | 641 | * When the Mini-A cable is disconnected from the board, |
642 | * the pin-detect interrupt happens before the disconnnect | 642 | * the pin-detect interrupt happens before the disconnect |
643 | * interrupts for the connected device(s). In order to | 643 | * interrupts for the connected device(s). In order to |
644 | * process the disconnect interrupt(s) prior to switching | 644 | * process the disconnect interrupt(s) prior to switching |
645 | * roles, the pin-detect interrupts are delayed, and handled | 645 | * roles, the pin-detect interrupts are delayed, and handled |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 055b64ef0bba..df1d7da933ec 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. | 2 | * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters. |
3 | * Please keep numerically sorted within individual areas, thanks! | 3 | * Please keep numerically sorted within individual areas, thanks! |
4 | * | 4 | * |
5 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais | 5 | * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais |
6 | * from Rudolf Gugler | 6 | * from Rudolf Gugler |
7 | * | 7 | * |
8 | */ | 8 | */ |
@@ -78,7 +78,7 @@ | |||
78 | */ | 78 | */ |
79 | #define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ | 79 | #define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ |
80 | 80 | ||
81 | /* www.starting-point-systems.com µChameleon device */ | 81 | /* www.starting-point-systems.com µChameleon device */ |
82 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ | 82 | #define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ |
83 | 83 | ||
84 | /* | 84 | /* |
@@ -291,7 +291,7 @@ | |||
291 | 291 | ||
292 | /* | 292 | /* |
293 | * Teratronik product ids. | 293 | * Teratronik product ids. |
294 | * Submitted by O. Wölfelschneider. | 294 | * Submitted by O. Wölfelschneider. |
295 | */ | 295 | */ |
296 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ | 296 | #define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ |
297 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ | 297 | #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ |
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c index 6d6923317f10..93d359f4d6a7 100644 --- a/drivers/usb/storage/isd200.c +++ b/drivers/usb/storage/isd200.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include "scsiglue.h" | 61 | #include "scsiglue.h" |
62 | 62 | ||
63 | MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); | 63 | MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC"); |
64 | MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>"); | 64 | MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>"); |
65 | MODULE_LICENSE("GPL"); | 65 | MODULE_LICENSE("GPL"); |
66 | 66 | ||
67 | static int isd200_Initialization(struct us_data *us); | 67 | static int isd200_Initialization(struct us_data *us); |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 24caba79d722..856ad92c40de 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
@@ -1914,7 +1914,7 @@ UNUSUAL_DEV( 0x1b1c, 0x1ab5, 0x0200, 0x0200, | |||
1914 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, | 1914 | USB_SC_DEVICE, USB_PR_DEVICE, NULL, |
1915 | US_FL_INITIAL_READ10 ), | 1915 | US_FL_INITIAL_READ10 ), |
1916 | 1916 | ||
1917 | /* Patch by Richard Schütz <r.schtz@t-online.de> | 1917 | /* Patch by Richard Schütz <r.schtz@t-online.de> |
1918 | * This external hard drive enclosure uses a JMicron chip which | 1918 | * This external hard drive enclosure uses a JMicron chip which |
1919 | * needs the US_FL_IGNORE_RESIDUE flag to work properly. */ | 1919 | * needs the US_FL_IGNORE_RESIDUE flag to work properly. */ |
1920 | UNUSUAL_DEV( 0x1e68, 0x001b, 0x0000, 0x0000, | 1920 | UNUSUAL_DEV( 0x1e68, 0x001b, 0x0000, 0x0000, |
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index c8f684833d58..2bfc846ac071 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
@@ -104,7 +104,7 @@ void i1480_usb_destroy(struct i1480_usb *i1480_usb) | |||
104 | * | 104 | * |
105 | * Data buffers to USB cannot be on the stack or in vmalloc'ed areas, | 105 | * Data buffers to USB cannot be on the stack or in vmalloc'ed areas, |
106 | * so we copy it to the local i1480 buffer before proceeding. In any | 106 | * so we copy it to the local i1480 buffer before proceeding. In any |
107 | * case, we have a max size we can send, soooo. | 107 | * case, we have a max size we can send. |
108 | */ | 108 | */ |
109 | static | 109 | static |
110 | int i1480_usb_write(struct i1480 *i1480, u32 memory_address, | 110 | int i1480_usb_write(struct i1480 *i1480, u32 memory_address, |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 56720fb476b3..46b03f53985f 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> | 4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> |
5 | * | 5 | * |
6 | * Created: | 6 | * Created: |
7 | * Description: ADSP-BF54x Framebufer driver | 7 | * Description: ADSP-BF54x Framebuffer driver |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * Modified: | 10 | * Modified: |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index d5e126759612..7a0c05f3537e 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> | 4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> |
5 | * | 5 | * |
6 | * Created: | 6 | * Created: |
7 | * Description: Blackfin LCD Framebufer driver | 7 | * Description: Blackfin LCD Framebuffer driver |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * Modified: | 10 | * Modified: |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 2209e354f531..c2d11fef114b 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -66,8 +66,6 @@ config SGI_NEWPORT_CONSOLE | |||
66 | Say Y here if you want the console on the Newport aka XL graphics | 66 | Say Y here if you want the console on the Newport aka XL graphics |
67 | card of your Indy. Most people say Y here. | 67 | card of your Indy. Most people say Y here. |
68 | 68 | ||
69 | # bool 'IODC console' CONFIG_IODC_CONSOLE | ||
70 | |||
71 | config DUMMY_CONSOLE | 69 | config DUMMY_CONSOLE |
72 | bool | 70 | bool |
73 | depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y | 71 | depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y |
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 0c6981f1a4a3..2c1a3402bef0 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * OMAP2 Remote Frame Buffer Interface support | 2 | * OMAP2 Remote Frame Buffer Interface support |
3 | * | 3 | * |
4 | * Copyright (C) 2005 Nokia Corporation | 4 | * Copyright (C) 2005 Nokia Corporation |
5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> | 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
6 | * Imre Deak <imre.deak@nokia.com> | 6 | * Imre Deak <imre.deak@nokia.com> |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index 8fb7c708f563..f79c137753d7 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * OMAP1 Special OptimiSed Screen Interface support | 2 | * OMAP1 Special OptimiSed Screen Interface support |
3 | * | 3 | * |
4 | * Copyright (C) 2004-2005 Nokia Corporation | 4 | * Copyright (C) 2004-2005 Nokia Corporation |
5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> | 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
8 | * under the terms of the GNU General Public License as published by the | 8 | * under the terms of the GNU General Public License as published by the |
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index dd5d67548758..576a388a1164 100644 --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com> | 4 | * (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com> |
5 | * added support for W83627THF. | 5 | * added support for W83627THF. |
6 | * | 6 | * |
7 | * (c) Copyright 2003,2007 Pádraig Brady <P@draigBrady.com> | 7 | * (c) Copyright 2003,2007 Pádraig Brady <P@draigBrady.com> |
8 | * | 8 | * |
9 | * Based on advantechwdt.c which is based on wdt.c. | 9 | * Based on advantechwdt.c which is based on wdt.c. |
10 | * Original copyright messages: | 10 | * Original copyright messages: |
@@ -401,6 +401,6 @@ module_init(wdt_init); | |||
401 | module_exit(wdt_exit); | 401 | module_exit(wdt_exit); |
402 | 402 | ||
403 | MODULE_LICENSE("GPL"); | 403 | MODULE_LICENSE("GPL"); |
404 | MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>"); | 404 | MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>"); |
405 | MODULE_DESCRIPTION("w83627hf/thf WDT driver"); | 405 | MODULE_DESCRIPTION("w83627hf/thf WDT driver"); |
406 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | 406 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); |
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids index de24e3decedd..119abea8c6cb 100644 --- a/drivers/zorro/zorro.ids +++ b/drivers/zorro/zorro.ids | |||
@@ -351,7 +351,7 @@ | |||
351 | 0200 EGS 28/24 Spectrum [Graphics Card] | 351 | 0200 EGS 28/24 Spectrum [Graphics Card] |
352 | 0892 Apollo | 352 | 0892 Apollo |
353 | 0100 A1200 [FPU and RAM Expansion] | 353 | 0100 A1200 [FPU and RAM Expansion] |
354 | 0893 Ingenieurbüro Helfrich | 354 | 0893 Ingenieurbüro Helfrich |
355 | 0500 Piccolo RAM [Graphics Card] | 355 | 0500 Piccolo RAM [Graphics Card] |
356 | 0600 Piccolo [Graphics Card] | 356 | 0600 Piccolo [Graphics Card] |
357 | 0700 PeggyPlus MPEG [Video Card] | 357 | 0700 PeggyPlus MPEG [Video Card] |