mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update linux 3.7 to 3.7.1
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34760 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -21,7 +21,7 @@ DEFAULT_PACKAGES += \
|
||||
kmod-cpu-msr \
|
||||
soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \
|
||||
hwclock wpad flashrom tc
|
||||
LINUX_VERSION:=3.7
|
||||
LINUX_VERSION:=3.7.1
|
||||
CS5535_MASK:=0x0E000048
|
||||
|
||||
CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -466,6 +466,8 @@ config X86_RDC321X
|
||||
@@ -462,6 +462,8 @@ config X86_RDC321X
|
||||
depends on X86_EXTENDED_PLATFORM
|
||||
select M486
|
||||
select X86_REBOOTFIXUPS
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
+
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -464,6 +464,7 @@ config X86_RDC321X
|
||||
@@ -460,6 +460,7 @@ config X86_RDC321X
|
||||
bool "RDC R-321x SoC"
|
||||
depends on X86_32
|
||||
depends on X86_EXTENDED_PLATFORM
|
||||
@@ -82,7 +82,7 @@
|
||||
select EMBEDDED
|
||||
--- a/arch/x86/include/asm/processor.h
|
||||
+++ b/arch/x86/include/asm/processor.h
|
||||
@@ -119,7 +119,8 @@ struct cpuinfo_x86 {
|
||||
@@ -141,7 +141,8 @@ struct cpuinfo_x86 {
|
||||
#define X86_VENDOR_CENTAUR 5
|
||||
#define X86_VENDOR_TRANSMETA 7
|
||||
#define X86_VENDOR_NSC 8
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
--- a/arch/x86/kernel/cpu/Makefile
|
||||
+++ b/arch/x86/kernel/cpu/Makefile
|
||||
@@ -26,6 +26,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix
|
||||
@@ -27,6 +27,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix
|
||||
obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
|
||||
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
|
||||
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
struct erase_info erase;
|
||||
--- a/include/linux/mtd/mtd.h
|
||||
+++ b/include/linux/mtd/mtd.h
|
||||
@@ -530,6 +530,9 @@ extern void register_mtd_user (struct mt
|
||||
@@ -396,6 +396,9 @@ extern void register_mtd_user (struct mt
|
||||
extern int unregister_mtd_user (struct mtd_notifier *old);
|
||||
void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/x86/Makefile
|
||||
+++ b/arch/x86/Makefile
|
||||
@@ -136,6 +136,9 @@ libs-y += arch/x86/lib/
|
||||
@@ -163,6 +163,9 @@ libs-y += arch/x86/lib/
|
||||
# See arch/x86/Kbuild for content of core part of the kernel
|
||||
core-y += arch/x86/
|
||||
|
||||
|
||||
@@ -7,5 +7,5 @@
|
||||
+ panic_on_unrecovered_nmi = 1;
|
||||
+
|
||||
return mfd_add_devices(&pdev->dev, -1,
|
||||
rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), NULL, 0);
|
||||
}
|
||||
rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells),
|
||||
NULL, 0, NULL);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/include/linux/timex.h
|
||||
+++ b/include/linux/timex.h
|
||||
@@ -274,7 +274,11 @@ extern void hardpps(const struct timespe
|
||||
@@ -150,6 +150,10 @@ extern void hardpps(const struct timespe
|
||||
int read_current_timer(unsigned long *timer_val);
|
||||
|
||||
/* The clock frequency of the i8253/i8254 PIT */
|
||||
@@ -10,5 +10,4 @@
|
||||
#define PIT_TICK_RATE 1193182ul
|
||||
+#endif
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* LINUX_TIMEX_H */
|
||||
|
||||
Reference in New Issue
Block a user