Skip to content

L
linux
Commit 2b590e85 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files
Options

[PATCH] trivial: remove duplicated #includes 

From: Rusty Russell <rusty@rustcorp.com.au>

From:  a.othieno@bluewin.ch (Arthur Othieno)
From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

Remove various duplicated #includes

From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

        Use mod_timer in drivers_block_floppy98.c

From:  carbonated beverage <ramune@net-ronin.org>

        doc update for bk usage
        bk://... appears to be dead, use http://... instead.
parent f110f331
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 31 deletions
Documentation/BK-usage/bk-kernel-howto.txt
View file @ 2b590e85
...@@ -279,5 +279,5 @@ specific state of the tree). ...@@ -279,5 +279,5 @@ specific state of the tree).
for my long-lived kernel branch? for my long-lived kernel branch?
A. Yes. This requires BK 3.x, though. A. Yes. This requires BK 3.x, though.
bk export -tpatch -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ bk export -tpatch -r`bk repogca http://linux.bkbits.net/linux-2.5`,+
Documentation/BK-usage/gcapatch
View file @ 2b590e85
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# Usage: gcapatch > foo.patch # Usage: gcapatch > foo.patch
# #
bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+ bk export -tpatch -hdu -r`bk repogca http://linux.bkbits.net/linux-2.5`,+
drivers/block/floppy98.c
View file @ 2b590e85
...@@ -704,15 +704,16 @@ static int output_log_pos; ...@@ -704,15 +704,16 @@ static int output_log_pos;
static void reschedule_timeout(int drive, const char *message, int marg) static void reschedule_timeout(int drive, const char *message, int marg)
{ {
unsigned long delay;
if (drive == current_reqD) if (drive == current_reqD)
drive = current_drive; drive = current_drive;
del_timer(&fd_timeout);
if (drive < 0 || drive > N_DRIVE) { if (drive < 0 || drive > N_DRIVE) {
fd_timeout.expires = jiffies + 20UL*HZ; delay = 20UL*HZ;
drive=0; drive=0;
} else } else
fd_timeout.expires = jiffies + UDP->timeout; delay = UDP->timeout;
add_timer(&fd_timeout); mod_timer(&fd_timeout, delay + jiffies);
if (UDP->flags & FD_DEBUG){ if (UDP->flags & FD_DEBUG){
DPRINT("reschedule timeout "); DPRINT("reschedule timeout ");
printk(message, marg); printk(message, marg);
......
drivers/block/rd.c
View file @ 2b590e85
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/genhd.h> #include <linux/genhd.h>
#include <linux/bio.h>
#include <linux/buffer_head.h> /* for invalidate_bdev() */ #include <linux/buffer_head.h> /* for invalidate_bdev() */
#include <linux/backing-dev.h> #include <linux/backing-dev.h>
#include <linux/blkpg.h> #include <linux/blkpg.h>
......
drivers/bluetooth/hci_ldisc.c
View file @ 2b590e85
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/sched.h> #include <linux/sched.h>
......
drivers/firmware/edd.c
View file @ 2b590e85
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/device.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/edd.h> #include <linux/edd.h>
......
drivers/media/video/saa7134/saa7134-input.c
View file @ 2b590e85
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/input.h> #include <linux/input.h>
......
drivers/mtd/chips/jedec_probe.c
View file @ 2b590e85
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
......
drivers/net/arm/ether00.c
View file @ 2b590e85
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
/* includes */ /* includes */
#include <linux/config.h> #include <linux/config.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
......
drivers/net/eepro100.c
View file @ 2b590e85
...@@ -120,7 +120,6 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1}; ...@@ -120,7 +120,6 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/mii.h>
/* enable PIO instead of MMIO, if CONFIG_EEPRO100_PIO is selected */ /* enable PIO instead of MMIO, if CONFIG_EEPRO100_PIO is selected */
#ifdef CONFIG_EEPRO100_PIO #ifdef CONFIG_EEPRO100_PIO
......
drivers/net/ibmveth.c
View file @ 2b590e85
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "ibmveth.h" #include "ibmveth.h"
......
drivers/net/netconsole.c
View file @ 2b590e85
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/tty_driver.h> #include <linux/tty_driver.h>
#include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
......
drivers/net/pcmcia/axnet_cs.c
View file @ 2b590e85
...@@ -937,7 +937,6 @@ module_exit(exit_axnet_cs); ...@@ -937,7 +937,6 @@ module_exit(exit_axnet_cs);
static const char *version_8390 = static const char *version_8390 =
"8390.c:v1.10cvs 9/23/94 Donald Becker (becker@scyld.com)\n"; "8390.c:v1.10cvs 9/23/94 Donald Becker (becker@scyld.com)\n";
#include <asm/uaccess.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
......
drivers/net/wireless/orinoco_pci.c
View file @ 2b590e85
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/wireless.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
drivers/net/wireless/orinoco_plx.c
View file @ 2b590e85
...@@ -125,7 +125,6 @@ not have time for a while.. ...@@ -125,7 +125,6 @@ not have time for a while..
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/wireless.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <pcmcia/cisreg.h> #include <pcmcia/cisreg.h>
......
drivers/net/wireless/orinoco_tmd.c
View file @ 2b590e85
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/wireless.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <pcmcia/cisreg.h> #include <pcmcia/cisreg.h>
......
drivers/pnp/pnpbios/bioscalls.c
View file @ 2b590e85
...@@ -11,15 +11,15 @@ ...@@ -11,15 +11,15 @@
#include <linux/pnpbios.h> #include <linux/pnpbios.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <asm/page.h>
#include <asm/system.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/desc.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/page.h>
#include <asm/desc.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
......
drivers/pnp/pnpbios/core.c
View file @ 2b590e85
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
#include <linux/pnpbios.h> #include <linux/pnpbios.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <asm/page.h>
#include <asm/system.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/desc.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/page.h>
#include <asm/desc.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
......
drivers/scsi/aha152x.c
View file @ 2b590e85
...@@ -240,8 +240,6 @@ ...@@ -240,8 +240,6 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include "scsi.h"
#include "hosts.h"
#include <asm/system.h> #include <asm/system.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -259,6 +257,7 @@ ...@@ -259,6 +257,7 @@
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#include "scsi.h" #include "scsi.h"
#include "hosts.h"
#include "aha152x.h" #include "aha152x.h"
......
drivers/scsi/dpt_i2o.c
View file @ 2b590e85
...@@ -58,7 +58,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver"); ...@@ -58,7 +58,6 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/stat.h>
#include <asm/processor.h> /* for boot_cpu_data */ #include <asm/processor.h> /* for boot_cpu_data */
#include <asm/pgtable.h> #include <asm/pgtable.h>
......
drivers/scsi/pcmcia/nsp_cs.c
View file @ 2b590e85
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/stat.h> #include <linux/stat.h>
......
drivers/serial/8250_acpi.c
View file @ 2b590e85
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/tty.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
......
drivers/usb/gadget/serial.c
View file @ 2b590e85
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <linux/uts.h> #include <linux/uts.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/list.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/tty.h> #include <linux/tty.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7