diff options
| author | Jiri Kosina | 2012-04-08 21:48:52 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2012-04-08 21:48:52 +0200 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /arch/arm/nwfpe | |
| parent | atm: fix comments (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | kernel-qcow2-linux-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.gz kernel-qcow2-linux-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.xz kernel-qcow2-linux-e75d660672ddd11704b7f0fdb8ff21968587b266.zip | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'arch/arm/nwfpe')
| -rw-r--r-- | arch/arm/nwfpe/fpa11.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c index cc60acde84d9..2782ebcc2ed3 100644 --- a/arch/arm/nwfpe/fpa11.c +++ b/arch/arm/nwfpe/fpa11.c @@ -28,7 +28,6 @@ #include <linux/compiler.h> #include <linux/string.h> -#include <asm/system.h> /* Reset the FPA11 chip. Called to initialize and reset the emulator. */ static void resetFPA11(void) |