Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
8793a6c5
Commit
8793a6c5
authored
Oct 08, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
parents
1728d005
d1482786
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
296 additions
and
375 deletions
+296
-375
arch/arm/Makefile
arch/arm/Makefile
+2
-4
arch/arm/configs/lart_defconfig
arch/arm/configs/lart_defconfig
+291
-370
arch/arm/mach-sa1100/cpu-sa1100.c
arch/arm/mach-sa1100/cpu-sa1100.c
+1
-1
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/lart.c
+1
-0
drivers/mtd/devices/lart.c
drivers/mtd/devices/lart.c
+1
-0
No files found.
arch/arm/Makefile
View file @
8793a6c5
...
...
@@ -155,10 +155,8 @@ zImage Image bootpImage: vmlinux
zinstall install
:
vmlinux
$(Q)$(MAKE)
$(build)
=
$(boot)
$@
MRPROPER_FILES
+=
\
include/asm-arm/arch include/asm-arm/.arch
\
include/asm-arm/constants.h
*
\
include/asm-arm/mach-types.h
CLEAN_FILES
+=
include/asm-arm/constants.h
*
include/asm-arm/mach-types.h
MRPROPER_FILES
+=
include/asm-arm/arch include/asm-arm/.arch
# We use MRPROPER_FILES and CLEAN_FILES now
archclean
:
...
...
arch/arm/configs/lart_defconfig
View file @
8793a6c5
This diff is collapsed.
Click to expand it.
arch/arm/mach-sa1100/cpu-sa1100.c
View file @
8793a6c5
...
...
@@ -194,7 +194,7 @@ static int sa1100_target(struct cpufreq_policy *policy,
new_ppcr
=
sa11x0_freq_to_ppcr
(
target_freq
);
if
((
sa11x0_ppcr_to_freq
(
new_ppcr
)
>
target_freq
)
&&
(
sa11x0_ppcr_to_freq
(
new_ppcr
-
1
)
>=
policy
->
min
))
m
ew_ppcr
--
;
n
ew_ppcr
--
;
break
;
}
...
...
arch/arm/mach-sa1100/lart.c
View file @
8793a6c5
...
...
@@ -8,6 +8,7 @@
#include <asm/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
...
...
drivers/mtd/devices/lart.c
View file @
8793a6c5
...
...
@@ -42,6 +42,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/mtd/mtd.h>
#ifdef HAVE_PARTITIONS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment