summaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-06 08:23:37 +0200
committerDavid S. Miller <davem@davemloft.net>2011-07-06 08:23:37 +0200
commite12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch)
tree83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /arch/sh/include
parentb44: Use pr_<level>_once and DRV_DESCRIPTION (diff)
parentnet: vlan: enable soft features regardless of underlying device (diff)
downloadlinux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.xz
linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/mmzone.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/include/asm/mmzone.h b/arch/sh/include/asm/mmzone.h
index 8887baff5eff..15a8496960e6 100644
--- a/arch/sh/include/asm/mmzone.h
+++ b/arch/sh/include/asm/mmzone.h
@@ -9,10 +9,6 @@
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn)
-#define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \
- NODE_DATA(nid)->node_spanned_pages)
-
static inline int pfn_to_nid(unsigned long pfn)
{
int nid;