diff options
| -rw-r--r-- | arch/x86/boot/.gitignore | 2 | ||||
| -rw-r--r-- | drivers/media/video/em28xx/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc-r9701.c | 1 | ||||
| -rw-r--r-- | kernel/.gitignore | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/boot/.gitignore b/arch/x86/boot/.gitignore index 18465143cfa2..b1bdc4c6f9f2 100644 --- a/arch/x86/boot/.gitignore +++ b/arch/x86/boot/.gitignore @@ -3,3 +3,5 @@ bzImage setup setup.bin setup.elf +cpustr.h +mkcpustr diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig index abbd38c1ebba..0f7a0bd86ff4 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/video/em28xx/Kconfig @@ -13,7 +13,8 @@ config VIDEO_EM28XX module will be called em28xx config VIDEO_EM28XX_ALSA - depends on VIDEO_EM28XX + depends on VIDEO_EM28XX && SND + select SND_PCM tristate "Empia EM28xx ALSA audio module" ---help--- This is an ALSA driver for some Empia 28xx based TV cards. diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 5e2d763c6b5f..0f8aca8a4d43 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -554,7 +554,6 @@ static void x25_asy_receive_buf(struct tty_struct *tty, const unsigned char *cp, static int x25_asy_open_tty(struct tty_struct *tty) { struct x25_asy *sl = (struct x25_asy *) tty->disc_data; - struct tty_ldisc *ld; int err; /* First make sure we're not already connected. */ diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c index a64626a82d0b..b35f9bfa2af4 100644 --- a/drivers/rtc/rtc-r9701.c +++ b/drivers/rtc/rtc-r9701.c @@ -71,7 +71,6 @@ static int read_regs(struct device *dev, unsigned char *regs, int no_regs) static int r9701_get_datetime(struct device *dev, struct rtc_time *dt) { - unsigned long time; int ret; unsigned char buf[] = { RSECCNT, RMINCNT, RHRCNT, RDAYCNT, RMONCNT, RYRCNT }; diff --git a/kernel/.gitignore b/kernel/.gitignore index f2ab70073bd4..ab4f1090f437 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -3,3 +3,4 @@ # config_data.h config_data.gz +timeconst.h |